[FFmpeg-cvslog] Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'

Michael Niedermayer git at videolan.org
Fri Jul 12 13:36:42 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 13:25:28 2013 +0200| [e9348e107bafcf0106c52f582d70fa53716b4ac4] | committer: Michael Niedermayer

Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'

* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
	libavcodec/mlpdec.c

See: a9cd12ee2afb3f3aad783c396816b23d8513f472

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

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





More information about the ffmpeg-cvslog mailing list