diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:49:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:49:44 +0100 |
| commit | 5a15bd6f2f40253dbc5d4add783d29cbe673aa97 (patch) | |
| tree | a8ce86aae36d45058f5db88b77d267c50e9121be /libavcodec | |
| parent | 27e79779821ed0cca312e1d38ac3b1d38999b6ef (diff) | |
| parent | 84f131921ffb43d8070d5680e91f6a24d66ccac4 (diff) | |
| download | ffmpeg-5a15bd6f2f40253dbc5d4add783d29cbe673aa97.tar.gz | |
Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'
* commit '84f131921ffb43d8070d5680e91f6a24d66ccac4':
avplay: do not call avcodec_get_frame_defaults().
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions