summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Add support for H.261 RTP payload format (RFC 4587)ThomasVolkert2014-08-24
|
* Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'Michael Niedermayer2014-08-23
|\ | | | | | | | | | | | | | | | | | | | | * commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110': ogg: Use separate classes for the aliases Conflicts: libavformat/oggenc.c See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: Use separate classes for the aliasesLuca Barbato2014-08-23
| | | | | | | | Unbreak 051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd
| * os_support: Undefine lseek/stat/fstat before defining themDiego Biurrun2014-08-22
| | | | | | | | This avoids a number of redefinition warnings on MinGW64.
* | Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd': ogg: Provide aliases for Speex, Opus and audio-only ogg Conflicts: Changelog libavformat/oggenc.c libavformat/version.h See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: Provide aliases for Speex, Opus and audio-only oggLuca Barbato2014-08-22
| | | | | | | | Since they are aliases for ogg enabling any of them enables ogg as well.
* | Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | * commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421': electronicarts: set the framerate for TGQ/TQI Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: set the framerate for TGQ/TQIAnton Khirnov2014-08-22
| | | | | | | | It is hardcoded to 15fps.
* | Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | * commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136': electronicarts: read the framerate for MAD Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: read the framerate for MADAnton Khirnov2014-08-22
| |
* | Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | | | | | | | * commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b': electronicarts: do not fail on zero-sized chunks Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: do not fail on zero-sized chunksAnton Khirnov2014-08-22
| | | | | | | | | | | | | | At least one FATE sample contains such chunks and happens to work simply by accident (due to find_stream_info() swallowing the error). CC: libav-stable@libav.org
* | Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'Michael Niedermayer2014-08-21
|\| | | | | | | | | | | | | | | | | | | * commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9': adts: Return more meaningful error codes Conflicts: libavformat/adtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adts: Return more meaningful error codesNidhi Makhijani2014-08-21
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/mov: use 64bit for size in mov_skip_multiple_stsd()Michael Niedermayer2014-08-21
| | | | | | | | | | | | | | | | Fixes integer overflow Fixes Ticket 3866 Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Check av_new_packet()s return codeMichael Niedermayer2014-08-20
| | | | | | | | | | | | Fixes CID1041093 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutdec: always initialize event_flagsMichael Niedermayer2014-08-20
| | | | | | | | | | | | Fixes: CID1231990 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | align and correct messages regarding bitstream filtersMoritz Barsnick2014-08-19
| | | | | | | | | | | | | | The messages regarding the recommended use of bitstream filters are somewhat different. This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea'Michael Niedermayer2014-08-19
|\| | | | | | | | | | | | | * commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea': mov: Drop unused parameter from ff_mov_read_esds() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Drop unused parameter from ff_mov_read_esds()Diego Biurrun2014-08-19
| | | | | | | | This is cleaner and avoids an uninitialized variable warning with MSVC.
* | avformat/cinedec: allow number zero in metadataBen Hagen2014-08-19
| |
* | avformat/a64: Avoid segfault in a64_write_header() when stream codec is not openAndrey Myznikov2014-08-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/iff: rudimentary support for animationsPaul B Mahol2014-08-18
| | | | | | | | | | | | For now only first frame is decoded. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | wvdec: check for eof in wv_read_block_header()Paul B Mahol2014-08-18
| | | | | | | | | | | | Fixes Ticket #3865 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | cafdec: check for eof in read_info_chunk()Paul B Mahol2014-08-18
| | | | | | | | | | | | Fixes Ticket #3864 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/wavdec: add sanity check for AVCodecContext.channelsJames Almer2014-08-18
| | | | | | | | | | | | | | | | Fixes ticket #3862. As a side effect, this also fixes aac_latm in wav. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxf: added ULs for demuxing avid media composer mxf filesMark Reid2014-08-18
| | | | | | | | | | | | The AAF SDK refers to these ULs as Legacy. These ULs are the same as the ones found in FFmbc's version of mxf.c and the ones found in libMXF Fixes Ticket#1554, Ticket#3100 and Ticket#3450
* | Merge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110': mxf: Support AAC Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Support AACLuca Barbato2014-08-17
| | | | | | | | | | | | | | Update mxf_set_audio_pts to use the container-provided information. The UL is marked as "to be changed in the future", but the current samples in the wild do use it.
* | Merge commit '747cd9560c2248ff2834f29cd2190646330e4676'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '747cd9560c2248ff2834f29cd2190646330e4676': mxf: Add the UL for the MPEG2VideoDescriptor Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add the UL for the MPEG2VideoDescriptorLuca Barbato2014-08-17
| |
* | Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '304089aca7d238ae184e09993b5c737aa22e2c2c': mxf: Add UID print helpers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add UID print helpersLuca Barbato2014-08-17
| | | | | | | | And use it to print non-parsed ULs.
* | lavf/http: remove special case for cookies attributes.Nicolas George2014-08-17
| | | | | | | | | | With the previous change, unknown attributes are all ignored, as specified by the RFC.
* | lavf/http: fix cookie parsing.Nicolas George2014-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code would use any unknown attribute-value pair as the cookie value. RFC 6265 states that the first key-value pair is the actual cookie, and the attribute-value pairs only start after. With the current code: Set-Cookie: test=good_value; path=/; dummy=42 gives this: Cookie: dummy=42 instead of this with the new code: Cookie: test=good_value
* | avformat/movenchint: use av_freep() for safetyMichael Niedermayer2014-08-17
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Use differential score for analyze()Michael Niedermayer2014-08-16
| | | | | | | | | | | | | | | | This avoids high scores in random data that has a high 0x47 frequency Fixes Ticket3844 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-08-16
|\ \ | | | | | | | | | | | | | | | | | | * cus/stable: mpegts: always parse pcr Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegts: always parse pcrMarton Balint2014-08-16
| | | | | | | | | | | | | | | | | | | | | Previously pcr transmitted without payload but as part of the video stream was not parsed. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | cinedec: add shutter and crop metadataBen Hagen2014-08-16
| | |
* | | avformat/udp: remove unneeded variable initializationMichael Niedermayer2014-08-16
| | | | | | | | | | | | | | | Found-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/udp: dont mix integers with pointersMichael Niedermayer2014-08-16
|/ / | | | | | | | | Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use new av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat/thp: dont mix integers with pointersMichael Niedermayer2014-08-16
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Drop remaining unneeded != NULLMichael Niedermayer2014-08-15
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | vformat/utils: call flush_packet_queue() from avformat_free_context()Michael Niedermayer2014-08-15
| | | | | | | | | | | | This avoids some theoretical memleaks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>