falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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>
tags/n2.4.4
Michael Niedermayer 11 years ago
parent
944570906b 12700b0219
commit
86b532898d
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available