diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
commit | cacbf64a76acb69b2efd773e8d7ab01bc957560d (patch) | |
tree | 80e9d70ed0a266a3540daa5707ff5b71ee2b475f /libavcodec/v410enc.c | |
parent | 13795dbb642cecf46e75fb6a78c830bf862c2310 (diff) | |
parent | 12e25ed284592b32c954d471e9b7b1e5a0dbf18d (diff) | |
download | ffmpeg-cacbf64a76acb69b2efd773e8d7ab01bc957560d.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v410enc.c')
0 files changed, 0 insertions, 0 deletions