summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* | Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'c9c1265c52910578d3db1a6205c85b91ead0903f': avformat: update muxing doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: update muxing doxyAnton Khirnov2014-07-09
| | | | | | | | The callers should now set the stream timebase, not the codec one.
* | Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'abda15a990527557c20848f6ca2f82eb85e76dc9': cdg: set the keyframe flag on the first packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdg: set the keyframe flag on the first packetAnton Khirnov2014-07-09
| | | | | | | | Bug-Id: 55
* | avformat/m4vdec: raise threshold slightly for detectionMichael Niedermayer2014-07-09
| | | | | | | | | | | | Fixes Ticket3746 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: respect color_range when encoding dnxhd.Mark Boorer2014-07-09
| | | | | | | | | | | | Set the ACLR atom appropriately for legal / full range. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: remove gettimeofday() use, remove sys/time.hMichael Niedermayer2014-07-08
| | | | | | | | | | | | | | It causes portability issues, and would need ifdef hell if its kept Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)Alexander V. Lukyanov2014-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | AVFormatContext->priv_data is not always a MpegTSContext, it can be RTSPState when decoding a RTP stream. So it is necessary to pass MpegTSContext pointer explicitly. This fixes memory corruption from bug #3721 (RTSPState is smaller than MpegTSContext thus innocent memory gets overwritten). Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'Michael Niedermayer2014-07-08
|\| | | | | | | | | | | | | | | | | | | * commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294': mov: Remove a variable that is set but never used Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Remove a variable that is set but never usedMartin Storsjö2014-07-08
| | | | | | | | | | | | This silences a warning with gcc. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'Michael Niedermayer2014-07-08
|\| | | | | | | | | | | | | | | | | | | | | * commit '52a1c32c0a86e84d43f977c5148e62975a0c6917': nut: Use nut->version in the version range check Conflicts: libavformat/nutdec.c Note, this bug did not affect ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Use nut->version in the version range checkLuca Barbato2014-07-08
| | | | | | | | | | It was wrongly left unchanged when the version field had been introduced. (c94e2e85cb6af8a570d8542a830556243bd32873)
| * avformat_new_stream: make the AVCodec parameter constRoman Savchenko2014-07-08
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * smoothstreamingenc: Fix a memory leak on errorsMichael Niedermayer2014-07-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1test: Check malloc callNidhi Makhijani2014-07-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/nutdec: if all else fails try to lookup video tag in isomMichael Niedermayer2014-07-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: check that the video resolution is supportedMichael Niedermayer2014-07-08
| | | | | | | | | | | | Resolutions are stored as 16bit integers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: simplify localtime* useMichael Niedermayer2014-07-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Support cutting at clocktimeDeti fliegl2014-07-07
| | | | | | | | | | Signed-off-by: Deti fliegl <fliegl@baycom.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'Michael Niedermayer2014-07-06
|\| | | | | | | | | | | | | * commit '77fc7b76726719746ca45df6c4a62c41abad506e': vc1test: Return proper error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1test: Return proper error codesNidhi Makhijani2014-07-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'Michael Niedermayer2014-07-06
|\| | | | | | | | | | | | | | | | | | | * commit '865461099e062de5a3a109c2a5be98004c11d8bd': librtmp: Don't free the temp url at the end of rtmp_open Conflicts: libavformat/librtmp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * librtmp: Don't free the temp url at the end of rtmp_openMartin Storsjö2014-07-06
| | | | | | | | | | | | | | | | librtmp can keep pointers to this string internally, and may use them at shutdown as well. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/smoothstreamingenc: fix memleakMichael Niedermayer2014-07-06
| | | | | | | | | | Fixes CID1224285 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not detect jp2 images as mov files.Carl Eugen Hoyos2014-07-05
| |
* | lavf/libssh: call ssh_userauth_none before ssh_userauth_listLukasz Marek2014-07-04
| | | | | | | | | | | | | | | | According to doc, ssh_userauth_none must be called before ssh_userauth_list. It solves login issue for new versions of libssh. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: remove functions from image pipe which are unneeded for ↵Michael Niedermayer2014-07-04
| | | | | | | | | | | | image pipes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: improve bmp probeMichael Niedermayer2014-07-04
| | | | | | | | | | | | fix probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: increase probe buffer to 2kMichael Niedermayer2014-07-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: set AVProbeData size correctly on corner cases of tiny filesMichael Niedermayer2014-07-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: avoid seekback on probeingMichael Niedermayer2014-07-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: allocate and clear padding area for probe correctlyMichael Niedermayer2014-07-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-07-04
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavf/ftp: always treat all response codes >= 500 as error lavf/ftp: explicitly enable UTF-8 lavf/ftp: make response parsing more RFC compliant Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/ftp: always treat all response codes >= 500 as errorLukasz Marek2014-07-04
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavf/ftp: explicitly enable UTF-8Lukasz Marek2014-07-04
| | | | | | | | | | | | | | | | | | | | | | | | Most FTP servers enable UTF-8 by default, but it is not required by the standard. Enabling it manually makes ffmpeg implementation more consistent when server doesn't enable it by default. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavf/ftp: make response parsing more RFC compliantLukasz Marek2014-07-04
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | | Autodetect JPEG2000 imagess.Carl Eugen Hoyos2014-07-04
|/ / | | | | | | | | Autodetection of jp2 files does not work yet, the files are detected as mov.
* | Merge commit '9279826008b80daad7446950a821f32033ccd33f'Michael Niedermayer2014-07-04
|\| | | | | | | | | | | | | * commit '9279826008b80daad7446950a821f32033ccd33f': id3v2enc: use a case-insensitive comparison for APIC picture type Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2enc: use a case-insensitive comparison for APIC picture typeAnton Khirnov2014-07-03
| |
* | Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'Michael Niedermayer2014-07-03
|\| | | | | | | | | | | | | | | | | | | * commit '0955e57ad07640574fc20ce0bea3c0b83982ada1': daud: split muxer and demuxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * daud: split muxer and demuxerNidhi Makhijani2014-07-03
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat: Add image3 demuxers with format autodetectionCarl Eugen Hoyos2014-07-03
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ivfenc: support VP9James Zern2014-07-03
| | | | | | | | | | | | libvpx tools accept vp9 ivf files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avformat: minor grammar improvementMichael Niedermayer2014-07-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'Michael Niedermayer2014-07-03
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b': lavf: document av_dump_format() Conflicts: libavformat/avformat.h See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: document av_dump_format()Vittorio Giovara2014-07-02
| |
| * matroskadec: Fix a double negation typoMichael Niedermayer2014-07-02
| | | | | | | | | | | | | | | | | | This typo has existed since this code was added in c16582579. Newer versions of clang pointed out that this comparison always was true (since the result of the negation is either 0 or 1, while AVDISCARD_ALL has the value 48). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Fix standalone compilation of the wtv muxer.Carl Eugen Hoyos2014-07-02
| |
* | Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | * commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4': matroska: Factor out mkv_write_stereo_mode Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: Factor out mkv_write_stereo_modeLuca Barbato2014-07-01
| |