[FFmpeg-cvslog] Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2

Michael Niedermayer git at videolan.org
Tue Mar 11 13:22:27 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 13:13:42 2014 +0100| [5227eac5b0408ea077ef7d1ff94ae35748fb012f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5227eac5b0408ea077ef7d1ff94ae35748fb012f
---





More information about the ffmpeg-cvslog mailing list