diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 17:49:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 17:49:36 +0100 |
| commit | d1e2d59f23a9c69b0b088a9a528b29f20c2948c1 (patch) | |
| tree | 1c7fb61eda9558303a46c593150dcfd07ced8485 /libavcodec/libfdk-aacenc.c | |
| parent | 205b2ba3d677330e023aac2f4bd3f624039256b9 (diff) | |
| parent | 56ffde3f619076650bdc6003cc683cf2f563463f (diff) | |
| download | ffmpeg-d1e2d59f23a9c69b0b088a9a528b29f20c2948c1.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow muxing h264 into ts with startcode "001" instead of "0001".
lavfi/fade: Do not overread input buffer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
0 files changed, 0 insertions, 0 deletions