diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:32:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:32:15 +0100 |
| commit | 44967ab60a9baf62f86bc727b51ff0acb587e676 (patch) | |
| tree | 1385f738c56d90099a20088c4003ed356277fc0b /libavcodec/jpeg2000.h | |
| parent | e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd (diff) | |
| parent | d7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671 (diff) | |
| download | ffmpeg-44967ab60a9baf62f86bc727b51ff0acb587e676.tar.gz | |
Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'
* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
lavc: deprecate avcodec_get_frame_defaults().
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.h')
0 files changed, 0 insertions, 0 deletions