aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/parseutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-10 20:51:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-10 20:51:51 +0200
commitb27c7d70d8ea6e589d0838f0d2529b99928b7192 (patch)
tree3ec19e69d80a6660230c964e0b37935c2f280412 /libavutil/parseutils.c
parente346176de9809afec3724139ee320b613f753062 (diff)
parented219ed36606be307403b46f969a82bf0568865b (diff)
downloadffmpeg-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 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions