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