diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 23:38:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 23:38:01 +0100 |
| commit | 7f90055470609ce0eebae38a69ea2310dffae134 (patch) | |
| tree | 781fc34c0bba5b71820788390112d74f524200ad /libavcodec/binkaudio.c | |
| parent | 182c674f68139f5613147fd9e0a7f196dc9c8bea (diff) | |
| parent | 34bbc81de8a49fbddb92b76dc733f40890480b2b (diff) | |
| download | ffmpeg-7f90055470609ce0eebae38a69ea2310dffae134.tar.gz | |
Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'
* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
lavf: simplify ff_hevc_annexb2mp4_buf
Conflicts:
libavformat/hevc.c
libavformat/hevc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/binkaudio.c')
0 files changed, 0 insertions, 0 deletions