Merge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 23:35:35 +0000 (00:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 23:35:35 +0000 (00:35 +0100)
commit86b532898d8a2dbd9ddd303434bd8a5a395b15a7
treeb6831e6aa8dbda10b0b9bd21d3ce7674b03ef6e4
parent944570906b7433846352cbb14730e96e94d232ab
parent12700b0219521a5f20c8ba47b3ad7857ea9e0554
Merge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4

* commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554':
  mp3enc: fix a triggerable assert

Conflicts:
libavformat/mp3enc.c

No change as the faulty assert is not in FFmpeg

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