[FFmpeg-cvslog] Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'

Michael Niedermayer git at videolan.org
Wed May 20 21:47:11 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 20 19:33:13 2015 +0200| [642355712b970c4b17a207cc0ea42ea6adaba39f] | committer: Michael Niedermayer

Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'

* commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1':
  hevc: make avcodec_decode_video2() fail if get_format() fails

Conflicts:
	libavcodec/hevc.c

See: cc5e4bb48476a89cc8ce0c41bc2bd2e8fda9b37c
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list