Merge commit '30e50c50274f88f0f5ae829f401cd3c7f5266719'

Browse Source

* commit '30e50c50274f88f0f5ae829f401cd3c7f5266719':
  lavf: eliminate ff_get_audio_frame_size()

Conflicts:
	libavformat/utils.c

Not merged as the removed code is needed for some bugfixes and
would break the fate tests

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

...

This commit is contained in:

Michael Niedermayer 2014-08-14 01:02:26 +02:00

parent 082d52354f 30e50c5027

commit 0de0c75ebb

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