diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
| commit | 13795dbb642cecf46e75fb6a78c830bf862c2310 (patch) | |
| tree | 1464c0fd10f716b7c75920cc5b9298ca48251ca8 /libavcodec/cinepak.c | |
| parent | a9ddb624890dd8c334617239793e63d93fbd52ee (diff) | |
| parent | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff) | |
| download | android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.gz android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.bz2 android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.zip | |
Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
rsodec: Use avpriv_report_missing_feature() where appropriate
Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cinepak.c')
| -rw-r--r-- | libavcodec/cinepak.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 181039cf91..f5bc113232 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -332,7 +332,7 @@ static int cinepak_decode (CinepakContext *s) /* if this is the first frame, check for deviant Sega FILM data */ if (s->sega_film_skip_bytes == -1) { if (!encoded_buf_size) { - av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0"); + avpriv_request_sample(s->avctx, "encoded_buf_size 0"); return AVERROR_PATCHWELCOME; } if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) { |