[FFmpeg-cvslog] Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'

Michael Niedermayer git at videolan.org
Fri May 3 12:21:42 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 12:15:01 2013 +0200| [6fc58a8cb6707087e31fa8396a9e73c6f7595638] | committer: Michael Niedermayer

Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'

* commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5':
  avcodec: Add field order information to AVCodecParserContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list