]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 22:38:01 +0000 (23:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 22:38:01 +0000 (23:38 +0100)
* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
  lavf: simplify ff_hevc_annexb2mp4_buf

Conflicts:
libavformat/hevc.c
libavformat/hevc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/hevc.c
libavformat/hevc.h

Simple merge
Simple merge