diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 11:59:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 11:59:34 +0200 |
| commit | d1423cf68f89d655ed395f052e4cf8915e7f7de0 (patch) | |
| tree | 139a8a0c52a8dfefe5b42cfef37b1c9aa0f7802f /libavformat/adp.c | |
| parent | 3c536bee54cad7e5686f0383d1dce7cf18bd4db4 (diff) | |
| parent | c7a983762ab40bca4f85be64995d5398a4307aa5 (diff) | |
| download | ffmpeg-d1423cf68f89d655ed395f052e4cf8915e7f7de0.tar.gz | |
Merge commit 'c7a983762ab40bca4f85be64995d5398a4307aa5' into release/2.2
* commit 'c7a983762ab40bca4f85be64995d5398a4307aa5':
roqvideoenc: set enc->avctx in roq_encode_init
See: e407615129a58d21d2a7b4660432a67e5741f89f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/adp.c')
0 files changed, 0 insertions, 0 deletions