[FFmpeg-cvslog] Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'

Michael Niedermayer git at videolan.org
Sat Jan 4 00:47:20 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 00:34:52 2014 +0100| [3cf1503beb35203ef4b9ddef5a2bc8b6f919eb12] | committer: Michael Niedermayer

Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'

* commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c':
  rv30: fix extradata size check.

Conflicts:
	libavcodec/rv30.c

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

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





More information about the ffmpeg-cvslog mailing list