diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:14:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:14:12 +0200 |
| commit | 1eb151c501ec66c554c3417b84acd57499241004 (patch) | |
| tree | 355052e76cbc7aa69e4fa98146e1c93ce38a22a5 /libavformat/nullenc.c | |
| parent | efb21b0a8fbc61d01ba1f22677abfbca99e6167d (diff) | |
| parent | fe9bb61f9a16be19ad91875632c39e44b7a99a8a (diff) | |
| download | ffmpeg-1eb151c501ec66c554c3417b84acd57499241004.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavformat/nullenc.c')
0 files changed, 0 insertions, 0 deletions