Message ID | 20210718012204.97733-4-zane@zanevaniperen.com |
---|---|
State | Accepted |
Commit | b28a3135af12efa7d7e275d5557a7e994b12a3f4 |
Headers | show |
Series | [FFmpeg-devel,1/8] avcodec/argo: use pixel format provided by the demuxer | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index c3ac49fdc2..ef647ae20c 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -109,12 +109,7 @@ int ff_argo_asf_fill_stream(AVFormatContext *s, AVStream *st, const ArgoASFFileH st->codecpar->bits_per_coded_sample = 4; - if (ckhdr->flags & ASF_CF_BITS_PER_SAMPLE) - st->codecpar->bits_per_raw_sample = 16; - else - st->codecpar->bits_per_raw_sample = 8; - - if (st->codecpar->bits_per_raw_sample != 16) { + if (!(ckhdr->flags & ASF_CF_BITS_PER_SAMPLE)) { /* The header allows for these, but I've never seen any files with them. */ avpriv_request_sample(s, "Non 16-bit samples"); return AVERROR_PATCHWELCOME;
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> --- libavformat/argo_asf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)