diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-14 03:07:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-14 03:08:01 +0200 |
| commit | 42a144f2c8a45baa6ae54adca7a41a179a3cc9d1 (patch) | |
| tree | 91649b40a9b991ccb74e383897c55869aebcac2b /libavcodec/aac.h | |
| parent | 89b3c5215a510c729de0eeded52b08fcc9fd2d2a (diff) | |
| parent | d0c895d3c58577860324d39d614db03f593e4835 (diff) | |
| download | ffmpeg-42a144f2c8a45baa6ae54adca7a41a179a3cc9d1.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac.h')
0 files changed, 0 insertions, 0 deletions