diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:36:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:36:10 +0100 |
| commit | e22e943ef90e5698df128ed245a530d4b97dc317 (patch) | |
| tree | 9dcd4e4f1f3c233d30a236db0c903c80a6bb3d95 /doc/examples/decoding_encoding.c | |
| parent | 409a143e4b49b9d1176aaf6c76da536ffd90152b (diff) | |
| parent | 674fa49110a661694188a958be13d529b7c8c5dd (diff) | |
| download | ffmpeg-e22e943ef90e5698df128ed245a530d4b97dc317.tar.gz | |
Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'
* commit '674fa49110a661694188a958be13d529b7c8c5dd':
avconv: do not call avcodec_get_frame_defaults()
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions