[FFmpeg-cvslog] Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'

Michael Niedermayer git at videolan.org
Sat Dec 21 00:51:20 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 21 00:39:11 2013 +0100| [e00281b6f507ab7dc83a632d9ad9f150a05a10e9] | committer: Michael Niedermayer

Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'

* commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8':
  hevc: refactor Profile Tier Level
  hevc: don't check for errors in PTL code

Conflicts:
	libavcodec/hevc_ps.c

See: 36658c978f5d7df2ce556075946f3a80f7eca753
See: dddc9b7a8ec3a03e48c69991ca7f20f10dd6f022
See: ecb21d24373ccf8f1d090cff48f4e0c384b7f998
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list