summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
| * mpegts: Mark wrongly-sized packets as corruptedZohar Kelrich2011-08-021-2/+7
| | | | | | | | | | Signed-off-by: Zohar Kelrich <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
| * mpegts: Move scan test to handle_packetsZohar Kelrich2011-08-021-19/+20
| | | | | | | | | | | | | | | | This fixes an issue where packets which start being read while reading the header stick around after a seek. Signed-off-by: Zohar Kelrich <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
| * mpegts: Mark corrupted packetsZohar Kelrich2011-08-021-0/+11
| | | | | | | | | | Signed-off-by: Zohar Kelrich <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
| * mpegts: Reset continuity counter on seekZohar Kelrich2011-08-021-0/+1
| | | | | | | | | | Signed-off-by: Zohar Kelrich <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
| * mpegts: Fix for continuity counterZohar Kelrich2011-08-021-10/+20
| | | | | | | | | | | | | | | | Make continuity counter respect discontinuity flag and null packets. Unpack the adaptation_field_control field. Signed-off-by: Zohar Kelrich <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
| * mpegts: Silence "can't seek" warning on unseekableZohar Kelrich2011-08-021-1/+1
| | | | | | | | | | | | | | | | Do not try to seek when we already know we are not allowed to. Silences warning that always happens when streaming. Signed-off-by: Zohar Kelrich <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
* | Support FourCC DreX as MPEG4 ASP.Carl Eugen Hoyos2011-08-011-0/+1
| |
* | Cosmetics: Restore alphabetical order.Carl Eugen Hoyos2011-08-011-6/+6
| |
* | Support muxing MP1, MP2 and MP3 in caf.Carl Eugen Hoyos2011-08-011-3/+43
| |
* | Explicitely fail for unsupported codecs when muxing caf.Carl Eugen Hoyos2011-08-011-0/+11
| |
* | Use av_get_bits_per_sample() for mBitsPerChannel in caf.Carl Eugen Hoyos2011-08-011-1/+1
| |
* | Cosmetics: Fix indentation.Naoya OYAMA2011-08-011-6/+6
| |
* | Limit fsize before adding to pointer.Reimar Döffinger2011-07-311-0/+1
| | | | | | | | | | | | | | This avoids a theoretically possible pointer arithmetic overflow which would lead to a crash due to reading from NULL page. Signed-off-by: Reimar Döffinger <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-303-7/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <[email protected]>
| * mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.Alex Converse2011-07-291-1/+1
| | | | | | | | This prevents out of bounds reads when extradata is being decoded.
| * probe: Fix insane flow control.Alex Converse2011-07-291-2/+2
| | | | | | | | A loop control variable was shadowed inside the loop and never updated.
| * mpegts: remove invalid error checkMike Williams2011-07-291-4/+0
| | | | | | | | | | | | | | | | mpegts_read_header is used by both mpegts and mpegtsraw, so this erro check is no longer valid. Signed-off-by: Mike Williams <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-291-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition x86: cabac: don't load/store context values in asm H.264: optimize CABAC x86 asm for Atom vp3/theora: flush after seek. doc/fftools-common-opts: wording fixes missing from the previous commit. doc: document using AVOptions in fftools. cmdutils: add codec_opts parameter to setup_find_stream_info_opts() cmdutils: clarify documentation for filter_codec_opts() cmdutils: clarify documentation for setup_find_stream_info_opts() lavf: add forgotten attribute_deprecated to av_find_stream_info() Merged-by: Michael Niedermayer <[email protected]>
| * lavf: add forgotten attribute_deprecated to av_find_stream_info()Anton Khirnov2011-07-281-0/+1
| |
* | Fix several security issues in matroskadec.c (MSVR-11-0080).Michael Niedermayer2011-07-281-8/+24
| | | | | | | | | | | | Whitespace of the patch cleaned up by Aurel Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR) Signed-off-by: Michael Niedermayer <[email protected]>
* | prefer "SAR" over "PAR" in av_dump_format()Stefano Sabatini2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "SAR" (Sample Aspect Ratio) is globally preferred over "PAR" (Pixel Aspect Ratio), although the two terms share the same semantics. For example the corresponding AVStream field is called sample_aspect_ratio, and libavfilter has a filter named setsar. Therefore prefer the term "SAR" over "PAR" in the libavformat/utils.c:dump_stream_format() and avcodec_string() output for avoiding confusion.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-261-4/+7
|\| | | | | | | | | | | | | * qatar/master: ape: adjust some printf format strings to correctly match argument types Merged-by: Michael Niedermayer <[email protected]>
| * ape: adjust some printf format strings to correctly match argument typesDiego Biurrun2011-07-261-4/+7
| |
* | muxer opts: fix avdict use in case of early private context allocMichael Niedermayer2011-07-251-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | rtp: disable udp fifos, the rtp code cannot work with the fifos in its ↵Michael Niedermayer2011-07-251-0/+1
| | | | | | | | | | | | current form as rtp bypasses the public API. Signed-off-by: Michael Niedermayer <[email protected]>
* | udp: allow fifo size to be tuned seperatelyMichael Niedermayer2011-07-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Use little endian for caf codec tags.Carl Eugen Hoyos2011-07-243-30/+30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-231-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: avoid a branch in 10-bit decode_dct_block() H.264: Add optimizations to predict x86 assembly. riff: Add mpgv MPEG-2 fourcc add Flash Screen Video 2 decoder Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <[email protected]>
| * riff: Add mpgv MPEG-2 fourccAlex Converse2011-07-221-0/+1
| | | | | | | | Supported by mplayer and seen in the wild.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-223-40/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: optimise dnxhd_decode_dct_block() rtp: remove disabled code eac3enc: use different numbers of blocks per frame to allow higher bitrates dnxhd: add regression test for 10-bit dnxhd: 10-bit support dsputil: update per-arch init funcs for non-h264 high bit depth dsputil: template get_pixels() for different bit depths dsputil: create 16/32-bit dctcoef versions of some functions jfdctint: add 10-bit version mov: add clcp type track as Subtitle stream. mpeg4: add Mpeg4 Profiles names. mpeg4: decode Level Profile for MPEG4 Part 2. ffprobe: display bitstream level. imgconvert: remove unused glue and xglue macros Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <[email protected]>
| * rtp: remove disabled codeDiego Biurrun2011-07-212-39/+0
| |
| * mov: add clcp type track as Subtitle stream.Thierry Foucu2011-07-211-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
* | au: reuse the result of the previous call to av_get_bits_per_sample()Stefano Sabatini2011-07-211-3/+3
| | | | | | | | | | Avoid an unnecessary call to the function, slighlty more robust/readable.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-201-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove h264_lowres_idct_put/add functions Remove snow/dwt test program h264: remove some disabled code Fix incorrect max_lowres values matroskadec: fix integer underflow if header length < probe length. cosmetics: indentation eac3enc: use frame exponent strategy when applicable. cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder. dsputil: fix ff_check_alignment() Conflicts: libavcodec/Makefile libavcodec/h264idct_template.c Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: fix integer underflow if header length < probe length.Chris Evans2011-07-191-0/+2
| | | | | | | | | | | | This fixes a crash with specifically crafted files. Signed-off-by: Ronald S. Bultje <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-193-17/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: simple_idct: simplify some ifdeffery simple_idct: remove code for DCTELEM != int16 Remove VLAs in ff_amrwb_lsp2lpc() fate: make vsynth tests depend on only the relevant vref rtsp: remove disabled code dsputil: restore mistakenly removed hunk of disabled code Merged-by: Michael Niedermayer <[email protected]>
| * rtsp: remove disabled codeDiego Biurrun2011-07-183-17/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-181-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h dsputil: remove disabled code tta: remove disabled code gxfenc: place variable declarations before statements x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template random_seed: use proper #includes Merged-by: Michael Niedermayer <[email protected]>
| * gxfenc: place variable declarations before statementsDiego Biurrun2011-07-171-1/+2
| | | | | | | | libavformat/gxfenc.c:409: warning: ISO C90 forbids mixed declarations and code
* | au: add computation for durationami_stuff2011-07-181-2/+8
| | | | | | | | Signed-off-by: Stefano Sabatini <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-17133-1482/+1327
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <[email protected]>
| * lavf: rename enc variable in utils.c:has_codec_parameters()Stefano Sabatini2011-07-171-12/+12
| | | | | | | | | | | | | | Rename it to "avctx", the old name was confusing as the function is used also with decoder contexts. Signed-off-by: Anton Khirnov <[email protected]>
| * lavf: use designated initialisers for all (de)muxers.Anton Khirnov2011-07-17132-1466/+1311
| | | | | | | | It's more readable and less prone to breakage.
| * wav: remove a use of deprecated AV_METADATA_ macroAnton Khirnov2011-07-171-1/+1
| |
| * rmdec: remove useless ap parameter from rm_read_header_old()Anton Khirnov2011-07-171-2/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-162-39/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) arm: remove disabled function dct_unquantize_h263_inter_iwmmxt() Remove commented-out call to non-existing function print_pow1(). Do not decode RV30 files if the extradata is too small flashsv: split flashsv_decode_block() off from flashsv_decode_frame(). ppc: remove disabled code libspeexdec: Drop const qualifier to silence compiler warning. libopenjpeg: Drop const qualifier to silence compiler warning. alac: Remove unused dummy code. Remove unused structs and tables. vaapi: do not assert on value read from input bitstream flashsvenc: replace bitstream description by a link to the specification flashsvenc: drop unnecessary cast flashsvenc: improve some variable names and fix corresponding comments flashsvenc: merge two consecutive if-conditions flashsvenc: merge variable declarations and initializations flashsvenc: convert some debug av_log() to av_dlog() flashsvenc: whitespace cosmetics flashsvenc: drop some unnecessary parentheses flashsvenc: fix some comment typos aacps: skip some memcpy() if src and dst would be equal ... Conflicts: libavcodec/vaapi_mpeg2.c libavformat/aviobuf.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf/utils: drop av_ prefixes from static functions.Anton Khirnov2011-07-151-30/+30
| |
| * avio: don't replicate avio_alloc_context functionality.Anton Khirnov2011-07-151-10/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-1513-21/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Automatically add more flags required on symbian mem.h: switch doxygen parameter order to match function prototype doxygen: replace @sa tag by the more readable but equivalent @see doxygen: use Doxygen markup for authors and web links where appropriate doxygen: do not include license boilerplate in Doxygen documentation ac3enc: Mark AVClasses const ffserver: Replace two loops with one loop. ffmpeg: Fix the check for experimental codecs swscale: extend mmx padding. swscale: clip unscaled colorspace conversion path. doxygen: misc consistency cosmetics doc: remove file name from @file directive in Doxygen usage example doxygen: consistently place brief description doxygen: place empty line between brief description and detailed description avformat_open_input(): Add braces to shut up gcc warning. Conflicts: libavcodec/8svx.c libavcodec/tiff.c libavcodec/tiff.h libavcodec/vaapi_h264.c libavcodec/vorbis.c libavcodec/vorbisdec.c libavcodec/vp6.c libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * doxygen: replace @sa tag by the more readable but equivalent @seeDiego Biurrun2011-07-156-7/+7
| |