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)
commit7f90055470609ce0eebae38a69ea2310dffae134
tree781fc34c0bba5b71820788390112d74f524200ad
parent182c674f68139f5613147fd9e0a7f196dc9c8bea
parent34bbc81de8a49fbddb92b76dc733f40890480b2b
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>
libavformat/hevc.c
libavformat/hevc.h