Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b'

Browse Source

* commit 'c9a13a289d0e1607387854127476813a1ee3d34b':
  lavc: remove old unused audio conversion functions.

Conflicts:
	libavcodec/audioconvert.c
	libavcodec/audioconvert.h

Merge only for metadata.
keeping the old API longer reduces the need for applications to be continuously
updated.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-10-29 10:21:23 +01:00

parent f1f0b01c47 c9a13a289d

commit 6bf4edec27

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available