[FFmpeg-cvslog] Merge commit '69ab9f53f901eac6a649e22d28cf093357870627'

Michael Niedermayer git at videolan.org
Thu Jul 9 05:24:06 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 05:04:13 2015 +0200| [07ae8fa20ef202206157efebf0a09db9a9cb9634] | committer: Michael Niedermayer

Merge commit '69ab9f53f901eac6a649e22d28cf093357870627'

* commit '69ab9f53f901eac6a649e22d28cf093357870627':
  hevc: split bitstream unescaping to a separate file

Conflicts:
	libavcodec/Makefile
	libavcodec/hevc.c

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

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





More information about the ffmpeg-cvslog mailing list