Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 12:13:42 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 12:13:42 +0000 (13:13 +0100)
commit5227eac5b0408ea077ef7d1ff94ae35748fb012f
treec4ae35bde00ce6c8de0ae629411dee110abd4516
parentbb40f8f5e22c0c4097a704fdd6e7a66b96f0318d
parent6d56bc9a6d853a33fe53ab63db580c4facaba420
Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2

* commit '6d56bc9a6d853a33fe53ab63db580c4facaba420':
  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