ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-06 17:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,298 Commits 37 Branches 400 Tags 497 MiB
3bcbd8c5c7
Commit Graph

33298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
e63e4c99c9 vsrc_color: use internal timebase 
Avoid timescale conversion, simplify.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-28 08:03:11 +02:00
Stefano Sabatini
57fa314090 lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 
Require "void *" rather than "AVClass *" for the log context type.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-28 08:02:53 +02:00
Stefano Sabatini
64abd375ec graphparser: prefer void * over AVClass * for log contexts 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-28 08:02:42 +02:00
Stefano Sabatini
59cef18c24 avfiltergraph: use meaningful error codes 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-28 08:02:32 +02:00
Alex Converse
4bb0b31f76 avconv: Initialize return value for codec copy path. 2011-09-27 19:32:26 -07:00
Michael Niedermayer
5a6e7771ed h264: dont set key_frame when the frame is not a real keyframe. 
Fixes Ticket514

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 03:47:39 +02:00
Mans Rullgard
dec4b4705f fate: use 'run' helper for seek-test 
This is simpler, and the actual seek-test command is printed with V=1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-09-28 02:30:30 +01:00
Mans Rullgard
bc3a741fa0 fate: remove seek-mpeg2reuse test 
The input file for this test is no longer generated.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-09-28 02:30:30 +01:00
Michael Niedermayer
530cd7a913 doc/ffmpeg.texi: merge changes from avconv.texi since last merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 03:19:22 +02:00
Michael Niedermayer
0aa793a1be ffplay: fix forgotten codec_name checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 03:19:22 +02:00
Michael Niedermayer
2f3dd904f4 ffmpeg: fix wrong indention that leaked in from merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 03:19:22 +02:00
Laurent Aimar
1f024b8820 Check for out of bound reads in the flic decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 02:59:28 +02:00
Michael Niedermayer
23c1db9b83 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: use different variables for decoded and filtered frame.
  avconv: add support for copying attachments.
  matroskaenc: write attachments.
  matroskadec: export mimetype of attachments as metadata.
  avconv: factorize common code from new_*_stream()
  doc/avconv: expand documentation for some options.
  doc/avconv: document -timelimit.

Conflicts:
	avconv.c
	cmdutils.c
	tests/codec-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 02:07:44 +02:00
Laurent Aimar
feca3ba053 Prevent out of bound accesses in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 01:04:52 +02:00
Laurent Aimar
b9596a5037 Check for invalid/corrupted bitstream in sun raster decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:52:37 +02:00
Laurent Aimar
19e95b8845 Prevent NULL dereferences when missing the reference frame in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:49:25 +02:00
Laurent Aimar
039f3c33ff Check for out of bounds reads in sun rasterfile decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:24:51 +02:00
Laurent Aimar
61930119cb Check for corrupted extra data in wmavoice decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:20:04 +02:00
Laurent Aimar
e09ae22ab7 Check for out of bound writes in the wmavoice decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:18:38 +02:00
Laurent Aimar
66aae97a60 Prevent NULL dereferences when missing the reference frame in the bink decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 23:45:37 +02:00
Michael Niedermayer
77d2ef13a8 Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080. 
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 <michaelni@gmx.at>

(cherry picked from commit 956c901c68)

Further suggestions from Kostya <kostya.shishkov@gmail.com> have been
implemented by Reinhard Tartler <siretart@tauware.de>

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-09-27 23:14:05 +02:00
Alex Converse
a9a033773a avconv: Fix volume adjustment for non-s16 sample formats 2011-09-27 14:10:12 -07:00
Alex Converse
fe332cf5b9 avconv: Make samples void*. 
Different sample formats are different sizes.
 2011-09-27 14:10:12 -07:00
Alex Converse
af3c06b4db avconv: Use the size of the decode sample format when allocating the audio samples buffer. 2011-09-27 14:10:12 -07:00
Tomas Härdin
a1cb09d351 mxf: Add PictureEssenceCoding UL for V210 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 22:27:52 +02:00
Michael Niedermayer
36be0f2e31 ffplay.texi: document -codec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 22:00:20 +02:00
Michael Niedermayer
5eda0967a5 ffplay: support -codec:avs to force a specific decoder implementation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:56:20 +02:00
Michael Niedermayer
07a96dc1e9 regression tests: add jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer
2fbf691038 j2kenc: Fix use of value before its initialized. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer
398b5327a3 j2kenc: only list pixel formats that fully work currently. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer
2214a67de5 j2kenc: fix colors on yuv444 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer
9e0438c903 img2enc: show first 4 bytes if a malformed jpeg2000 codestream is detected 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer
0047ac1427 img2enc: Accept raw jpeg2000 codestream too, 
our decoder outputs that, jasper can as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Dominique Leuenberger
bfea160094 RELEASE: set to 0.8.4.git after the release from 2011-09-22 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:17 +02:00
Michael Niedermayer
34ac8ec2ea j2kenc: enable 4:2:0 YUV it works as "well" as the other subsampled yuv formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer
c4b269c5c6 build system: enable j2kenc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer
e6aed5f404 j2kenc: fix coded_frame and prevent null pointer dereference. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer
40923e1567 j2kenc: Update ff_j2k_init_component() arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer
2f16b6a525 j2kenc: fix arguments for ff_j2k_getnbctxno() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer
0db973e0d7 j2kenc: mark as experimental. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer
1c20a0b354 j2kenc: s/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Michael Niedermayer
de89bc994c j2kenc: update codec name to modern ffmpeg 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Michael Niedermayer
1e086fd730 j2kenc: cleanup() is not used outside thus it is static 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Michael Niedermayer
c153c00367 j2kenc: update function name. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Anton Khirnov
d3c1d37a90 avconv: use different variables for decoded and filtered frame. 
Makes the code less obfuscated and fixes encoding one video stream to
several outputs.

Also use avcodec_alloc_frame() instead of allocating AVFrame on stack.

Breaks me_threshold in avconv, as motion vectors aren't passed through
lavfi. They could be copied manually, but I don't think this misfeature
is useful enough to justify ugly hacks.
 2011-09-27 19:17:37 +02:00
Anton Khirnov
3ccd15803b avconv: add support for copying attachments. 2011-09-27 15:26:36 +02:00
Anton Khirnov
c7a63a521b matroskaenc: write attachments. 2011-09-27 15:26:36 +02:00
Anton Khirnov
98cfe22b5c matroskadec: export mimetype of attachments as metadata. 2011-09-27 15:26:36 +02:00
Anton Khirnov
becdce99eb avconv: factorize common code from new_*_stream() 2011-09-27 15:26:35 +02:00
Anton Khirnov
d159060a87 doc/avconv: expand documentation for some options. 2011-09-27 15:26:35 +02:00