diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:34:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:34:33 +0200 |
| commit | f233666880afd1f2c0b9902c762df7a8733510a8 (patch) | |
| tree | 43199954cc71aa822c1d0fb2b73fda2edf411e60 /libavformat/rtpdec_ilbc.c | |
| parent | 57fa9e97424de601a5f10ad7bfc6ce48597c783f (diff) | |
| parent | 650d384048ed42579cc6d67bf32a94b468c0b6cb (diff) | |
Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'
* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
yuv4mpegenc: do not access AVCodecContext.coded_frame
Conflicts:
libavformat/yuv4mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_ilbc.c')
0 files changed, 0 insertions, 0 deletions