[FFmpeg-cvslog] Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'

Michael Niedermayer git at videolan.org
Tue Feb 17 21:35:22 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 21:25:07 2015 +0100| [2980c8e7d34e84f98b09965d208a583a16d5aded] | committer: Michael Niedermayer

Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'

* commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
  lavc: Document interaction between avcodec_open2() and decoding routines

Conflicts:
	libavcodec/avcodec.h

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

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





More information about the ffmpeg-cvslog mailing list