[FFmpeg-cvslog] Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'
Michael Niedermayer
git at videolan.org
Tue Sep 3 14:16:16 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 3 14:14:12 2013 +0200| [1eb151c501ec66c554c3417b84acd57499241004] | committer: Michael Niedermayer
Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'
* commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a':
pictordec: pass correct context to avpriv_request_sample
Conflicts:
libavcodec/pictordec.c
No change as the avpriv_request_sample() has already been replaced by an implementation
of the codepath.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1eb151c501ec66c554c3417b84acd57499241004
---
More information about the ffmpeg-cvslog
mailing list