summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | ffprobe: always exit 1 in case of errorsStefano Sabatini2013-06-27
| | | | | | | | | | | | | | | This is consistent with the other ff* tools, and also avoids spurious success reports when ret%256 = 0.
* | | ffprobe: reindent after previous commitStefano Sabatini2013-06-27
| | |
* | | ffprobe: fix exit code with stream specifiersNicolas George2013-06-27
| | | | | | | | | | | | | | | | | | | | | Without this fix, ffprobe would exit with a failure exit code if a stream specifier is given that selects the last stream. Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
* | | ffprobe: simplify branching logic in probe_file()Stefano Sabatini2013-06-27
| | |
* | | examples/muxing: rename audio/video_pts to audio/video_timeStefano Sabatini2013-06-26
| | | | | | | | | | | | | | | The new name is less confusing, since the variables represent times rather than timestamps.
* | | doc/bitstream_filters: document the chomp filterStefano Sabatini2013-06-26
| | | | | | | | | | | | TODO: add some meaningful examples.
* | | doc/bitstream-filters.texi: add documentation for the aac_adtstoasc filterStefano Sabatini2013-06-26
| | | | | | | | | | | | Based on the notes in libavcodec/aac_adtstoasc_bsf.c.
* | | lavf/movenc: improve error feedback in case malformed AAC bitstream is detectedStefano Sabatini2013-06-26
| | | | | | | | | | | | Consistent with the FLV muxer.
* | | lavf/mux: rename variable cortag -> tagbuf2 in init_muxer()Stefano Sabatini2013-06-26
| | | | | | | | | | | | Possibly enhance readibility.
* | | lavc/utils: improve feedback in case of invalid packet sizeStefano Sabatini2013-06-26
| | |
* | | examples/Makefile: disable -O2 optimizationsStefano Sabatini2013-06-26
| | | | | | | | | | | | | | | There is no much point in optimizing example code, and the -O2 flag is annoying when debugging.
* | | examples/muxing: remove useless instructionStefano Sabatini2013-06-26
|/ / | | | | | | Simpler and less confusing.
* | doc/filters: Fix texi syntaxJean Delvare2013-06-26
| | | | | | | | | | | | | | | | | | | | Commit f1efaf837117718e3b4c96336fe9b5f686b1fe30 used parentheses instead of curly braces in texi syntax, resulting in warnings when the documentation is generated. Fix that. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: Fix PAL8 input with alphaMichael Niedermayer2013-06-26
| | | | | | | | | | | | Fixes Ticket2158 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/src_movie: Fix handling of packet size for videoMichael Niedermayer2013-06-26
| | | | | | | | | | | | See Ticket2556 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavfilter/src_movie: fix which packet is resetMichael Niedermayer2013-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Require pthreads for compilation with OpenCL support.Carl Eugen Hoyos2013-06-26
| | | | | | | | | | | | Fixes a part of ticket #2422. Reviewed-by: James Almer
* | Use AV_RN32 for an unaligned read in the mxg demuxer.Carl Eugen Hoyos2013-06-26
| | | | | | | | Fixes ticket #2707.
* | lavf: silence max_analyze_duration warningwm42013-06-26
| | | | | | | | | | | | | | | | | | | | | | | | This is part of normal operation with some formats. A warning should indicate that something is wrong, and the documentation for AV_LOG_WARNING says: "Something somehow does not look correct." Since this message is most likely useful for debugging only, raise the log level accordingly. Plus-one-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cllc: Fix clobbered ff_get_buffer() changeMichael Niedermayer2013-06-26
| | | | | | | | | | | | | | Issue-since: 9328ae484338b70a7f2dbcd420bbbac499df76cc Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_drawbox: give all v_log() a contextMichael Niedermayer2013-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_drawbox: avoid declaration in for() argumentsMichael Niedermayer2013-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpegMichael Niedermayer2013-06-26
|\ \ | | | | | | | | | | | | | | | | | | | | | * 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg: enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples Reviewed-by: Andrey Utkin Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, ↵Mark Visser2013-06-25
| | | | | | | | | | | | added examples
* | | xa: abort if number of channels or sample rate is 0Paul B Mahol2013-06-25
| | | | | | | | | | | | | | | | | | Fixes #2711. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | lxfdec: remove wrong and unneeded checkLuca Barbato2013-06-25
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | examples/muxing: vertically alignStefano Sabatini2013-06-25
| | |
* | | lavc/pngdec: return meaningful error codesStefano Sabatini2013-06-25
| | |
* | | lavfi/movie: free packet on decoder errorMichael Niedermayer2013-06-25
| | | | | | | | | | | | | | | | | | Prevents infinite loop, see Ticket2556 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-25
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * qatar/master: configure: Do not omit frame pointers for msvc/icl debug builds Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | configure: Do not omit frame pointers for msvc/icl debug buildsAlex Smith2013-06-24
| | | | | | | | | | | | | | | | | | | | | Because O1 or O2 are required to build libav with msvc/icl, this must be explicitly set instead of just omitting Oy. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | Merge commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49'Michael Niedermayer2013-06-25
|\| | | | | | | | | | | | | | | | | | | | * commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49': configure: Do not explicitly set Oy for msvc/icl Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | configure: Do not explicitly set Oy for msvc/iclAlex Smith2013-06-24
| | | | | | | | | | | | | | | | | | | | | It is implied by O1 or O2, both of which are required to build libav with msvc/icl. Silences warnings when targeting x64 with icl. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | Merge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'Michael Niedermayer2013-06-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b': fate: Add Canopus Lossless YUY2 test Conflicts: tests/fate/lossless-video.mak tests/ref/fate/cllc-yuy2-noblock No change as the change is already in master Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | fate: Add Canopus Lossless YUY2 testDerek Buitenhuis2013-06-24
| | | | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | fate: Add Canopus Lossless YUY2 testDerek Buitenhuis2013-06-25
| | | | | | | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'Michael Niedermayer2013-06-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22': cllc: Use outbuf in RGB and ARGB functions cllc: Implement YUV support Conflicts: libavcodec/cllc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | cllc: Use outbuf in RGB and ARGB functionsDerek Buitenhuis2013-06-24
| | | | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * | cllc: Implement YUV supportDerek Buitenhuis2013-06-24
| | | | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'Michael Niedermayer2013-06-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0ce601c160c87349d093d7e542b5c752754f598': doc/platform: Add info about ICL Conflicts: doc/platform.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | doc/platform: Add info about ICLDerek Buitenhuis2013-06-24
| | | | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | yuv4mpeg: correctly handle chroma for odd luma sizes.Ronald S. Bultje2013-06-24
| | | | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | lavf/webvttdec: use private option to specify WebVTT kindMatthew Heaney2013-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebVTT subtitle tracks have four kinds. Certain downstream muxers (such as for WebM) need to know which WebVTT kind this is, in order to specify the codec id of the output track. A new private input option, "-kind", has been added to the WebVTT demuxer. It accepts as a value any of "subtitles" (the default), "captions", "descriptions", and "metadata". The kind option value is used to assign a value to the stream disposition flag, to which four new values have been added, corresponding the four WebVTT kinds. Signed-off-by: Matthew Heaney <matthewjheaney@google.com> Signed-off-by: Clément Bœsch <ubitux@gmail.com>
* | | lavf: add AV_DISPOSITION flags for WebVTT text track kindsMatthew Heaney2013-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 4 separate WebVTT text track kinds: subtitles (the default if not otherwise specified), captions, descriptions, and metadata. The WebM muxer needs to know which WebVTT text track kind this is, in order to synthesize the correct track type and codec id. To allow a demuxer to indicate the text track kind of the input, a new set of AV_DISPOSITION flag values has been added, corresponding to each of the non-default text track kind values.
* | | cllc: Use outbuf in RGB and ARGB functionsDerek Buitenhuis2013-06-24
| | | | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | cllc: Implement YUV supportDerek Buitenhuis2013-06-24
| | | | | | | | | | | | | | | | | | Fixes ticket #1910. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | avfilter/vsrc_testsrc: fix artifacts with odd heightMichael Niedermayer2013-06-24
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | h264: Fix null pointer dereference with disabled error concealmentMichael Niedermayer2013-06-24
| | | | | | | | | | | | | | | | | | Fixes Ticket2551 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/avio: Fix EOF handiling of ffurl_read_complete()Michael Niedermayer2013-06-24
| | | | | | | | | | | | | | | | | | Fixes Ticket2537 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: don't abort if both encoder and muxer aspect ratios are not set Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>