Merge commit 'ce424e57d629072652935501b439c1a6310c2089' into release/1.1

Browse Source

* commit 'ce424e57d629072652935501b439c1a6310c2089':
  mp3enc: fix a triggerable assert

Conflicts:
	libavformat/mp3enc.c

Changed code is not in FFmpeg

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

...

This commit is contained in:

Michael Niedermayer

2014-12-21 04:22:30 +01:00

parent 74e52afe8f ce424e57d6

commit 7a6907fcc3

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

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

Diff Content Not Available