diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-10 20:51:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-10 20:51:51 +0200 |
| commit | b27c7d70d8ea6e589d0838f0d2529b99928b7192 (patch) | |
| tree | 3ec19e69d80a6660230c964e0b37935c2f280412 /libavformat/mxfdec.c | |
| parent | e346176de9809afec3724139ee320b613f753062 (diff) | |
| parent | ed219ed36606be307403b46f969a82bf0568865b (diff) | |
| download | ffmpeg-b27c7d70d8ea6e589d0838f0d2529b99928b7192.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mss1: fix decoding masked regions in interframes
mxfdec: fix off by one error.
mxfdec: only parse next partition pack if parsing forward
mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
mxfdec: fix frame height vs field height confusion
mxfdec: Add intra_only flag to MXFTrack
mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
mxfdec: truncate packets that extend past the next edit unit
mxfdec: set pixel format for cdci picture formats
mxfdec: detect uncomp pictures using essence container ul
mxfdec: set track edit rate num/den in expected order
x86/cpu: implement get/set_eflags using intrinsics
x86/cpu: implement support for cpuid through intrinsics
x86/cpu: implement support for xgetbv through intrinsics
lavu: use intrinsics for emms on systems lacking inline asm support
mem: Don't abort on av_malloc(0) in debug mode
Conflicts:
configure
libavformat/mxf.h
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfdec.c')
| -rw-r--r-- | libavformat/mxfdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 3e79265e3f..a553eb5630 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1527,7 +1527,8 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) if (st->codec->codec_id == CODEC_ID_RAWVIDEO) { st->codec->pix_fmt = descriptor->pix_fmt; if (st->codec->pix_fmt == PIX_FMT_NONE) { - pix_fmt_ul = mxf_get_codec_ul(ff_mxf_pixel_format_uls, &descriptor->essence_codec_ul); + pix_fmt_ul = mxf_get_codec_ul(ff_mxf_pixel_format_uls, + &descriptor->essence_codec_ul); st->codec->pix_fmt = pix_fmt_ul->id; if (st->codec->pix_fmt == PIX_FMT_NONE) { /* support files created before RP224v10 by defaulting to UYVY422 @@ -1972,7 +1973,7 @@ static int64_t mxf_set_current_edit_unit(MXFContext *mxf, int64_t current_offset * around this fixes the infinite loop on zzuf3.mxf */ av_log(mxf->fc, AV_LOG_ERROR, "next_ofs didn't change. not deriving packet timestamps\n"); - return - 1; + return -1; } if (next_ofs > current_offset) |