[FFmpeg-cvslog] Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'
Michael Niedermayer
git at videolan.org
Mon Mar 10 23:54:27 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 23:38:01 2014 +0100| [7f90055470609ce0eebae38a69ea2310dffae134] | committer: Michael Niedermayer
Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'
* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
lavf: simplify ff_hevc_annexb2mp4_buf
Conflicts:
libavformat/hevc.c
libavformat/hevc.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f90055470609ce0eebae38a69ea2310dffae134
---
More information about the ffmpeg-cvslog
mailing list