RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
33,410 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

33410 Commits

Author SHA1 Message Date
Michael Niedermayer 714517b26a flvenc: Ignore metadata that has special values and is stored already based on 
more correct values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 03:20:57 +02:00
Michael Niedermayer 9fa05db400 swr-docs: update due to last change to swresample 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 00:32:01 +02:00
Michael Niedermayer 503e5e9db5 libswresample: support directly converting sampleformats and packed/planar in a single pass. 
Previously a intermediate planar format was used when both input and output where packed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 00:07:03 +02:00
Michael Niedermayer 63b6d5f33f update_stream_timings: Remove redundant check. 
Found-by:Nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 00:07:03 +02:00
Clément Bœsch d7366d918f libmodplug: handle EOF correctly. 2011-10-05 23:45:09 +02:00
Carl Eugen Hoyos d9b6068764 Use WMAv2 as default audio codec for asf. 2011-10-05 23:44:14 +02:00
Carl Eugen Hoyos 3bcbd8c5c7 Use M4S2 as default video tag for MPEG-4 ASP in asf. 2011-10-05 23:44:13 +02:00
Clément Bœsch 9a2ceee2e3 libmodplug: simplify and fix read_packet() callback. 
In case of av_new_packet() error, a correct return error code is raised,
the data memcpy is avoided, and pkt dts/pts are not assigned anymore
(since the defaults are good).
 2011-10-05 21:25:03 +02:00
Clément Bœsch 5420885737 libmodplug: consistent use of sizeof. 2011-10-05 21:25:02 +02:00
Michael Niedermayer f9bd979476 generic seeking: fail if there are 1000 non keyframes found with no keyframe. 
This avoids scanning through a whole file just to fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-05 18:23:47 +02:00
Ronald S. Bultje 4418aa9cb3 h264: correct implicit_weight for field-interlaced pictures. 2011-10-05 04:01:23 -07:00
Ronald S. Bultje 330deb7592 mpegvideo: set correct offset for edge emulation buffer. 
Using the old code, half of it was unused and the other half was too
small for e.g. >8bpp interlaced data, causing random buffer overruns.
 2011-10-05 04:01:23 -07:00
Ronald S. Bultje 0884dd5a1b mpegvideo: fix position of bottom edge. 
It was wrong in colorspaces where horizontal and vertical chroma
subsampling are not the same, e.g. 422.
 2011-10-05 04:01:23 -07:00
Diego Biurrun e83c2ddebf Fix 'heigth' vs. 'height' typos. 2011-10-05 11:12:01 +02:00
Anton Khirnov a4ea00d021 lavc/lavf: use unique private classes. 
This is needed by the new AVOptions API.
 2011-10-05 07:52:30 +02:00
Anton Khirnov 0ba1e1978d lavc: use designated initializers for av_codec_context_class 2011-10-05 07:52:05 +02:00
Michael Niedermayer ec1ffae0cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements.
  qcelp: check output buffer size before decoding
  qcelpdec: fix the return value of qcelp_decode_frame().
  sipr: fix the output data size check and only calculate it once.
  Synchronize various 4CCs and codec tags from FFmpeg.
  qdm2: check output buffer size before decoding
  Fix out of bound reads in the QDM2 decoder.
  Check for out of bound writes in the QDM2 decoder.
  ogg/celt: do not set sample_fmt in the demuxer

Conflicts:
	libavcodec/avcodec.h
	libavcodec/qdm2.c
	libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-05 04:07:59 +02:00
Michael Niedermayer f7da257a89 h264: remove assert() on ref_frame_count. 
This assert can fail if a SPS with a smaller value becomes active.
Fixes Ticket532

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-05 03:21:47 +02:00
Michael Niedermayer f108b33568 configure: fix compilation without libmodplug 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-05 00:34:14 +02:00
Laurent Aimar 0333d234b0 h264: do not let invalid values in h->ref_count after a decoder reset. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-05 00:07:39 +02:00
Laurent Aimar 253d18b352 h264: bit depth/chroma idc changes must go through a full format negociation. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-05 00:07:39 +02:00
Laurent Aimar a51fbb56bb h254: explicitly initialize bit depth/chroma idc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-05 00:07:39 +02:00
Michael Niedermayer 751a4efd4d libx264: Fix loop failure due to bufsize becoming 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 23:21:52 +02:00
Justin Ruggles dd376b1a12 qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 
'while', 'if/else', and 'switch' statements.

also fixes some spacing, but only if already changing a line
 2011-10-04 17:10:11 -04:00
Justin Ruggles e43dd3d2a8 qcelp: check output buffer size before decoding 2011-10-04 17:10:11 -04:00
Chris Rankin bde2570013 qcelpdec: fix the return value of qcelp_decode_frame(). 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-10-04 17:09:53 -04:00
Clément Bœsch 26c7ff9317 Add libmodplug support. 2011-10-04 22:36:33 +02:00
Justin Ruggles 1b5a189f06 sipr: fix the output data size check and only calculate it once. 2011-10-04 16:13:20 -04:00
Clément Bœsch 073effb6e4 deshake: simplify filename check. 2011-10-04 21:36:54 +02:00
Clément Bœsch e39be59b85 configure: remove bashism equality check for target_os. 2011-10-04 21:36:54 +02:00
Clément Bœsch d4005e22c3 deshake: misc style fixes. 2011-10-04 21:36:54 +02:00
Michael Niedermayer b0f270fdef deshake: move angles from stack to heap. 
Fixes Ticket530

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 18:32:36 +02:00
Michael Niedermayer 1e4da6031c deshake: Allow specifying the filename for statistics and disable them by default. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 17:20:42 +02:00
Diego Biurrun 12bd8532cf Synchronize various 4CCs and codec tags from FFmpeg. 2011-10-04 11:58:53 +02:00
Michael Niedermayer 171a5b5d36 deshake: remove non const static 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 08:31:40 +02:00
Clément Bœsch 1912c215e0 doxygen: remove a few @file parameters. 
It is not mandatory and prevents breakage on rename.
 2011-10-04 08:04:17 +02:00
Clément Bœsch 65d5edcd2c lavfi: remove align tabs in Makefile. 2011-10-04 07:56:56 +02:00
Clément Bœsch dc3aeba3b1 ass_split: fix invalid doxygen group end markers. 2011-10-04 07:48:56 +02:00
Clément Bœsch a667e90aae proresdec_gpl: remove wrong @file reference. 2011-10-04 07:48:56 +02:00
Clément Bœsch 64960fedee bintext: remove wrong @file reference. 2011-10-04 07:48:55 +02:00
Clément Bœsch 136093236f deshake: fix doxygen comments. 2011-10-04 07:48:55 +02:00
Clément Bœsch 5241e0144f isom: replace pseudo doxycomments with normal comments. 
Those chunks don't need to be parsed and they weren't parsed correctly
by Doxygen anyway.
 2011-10-04 07:48:24 +02:00
Michael Niedermayer f962518036 pngdec: set reference correctly for corepng. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 06:39:29 +02:00
Michael Niedermayer 51b0694bc0 ff_dv_frame_profile2: Check input buffer size. 
Based on code by DivX, Inc. / drffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 04:22:55 +02:00
Michael Niedermayer dd968a2edf cinepak: detect keyframes 
Code by DivX, Inc.
Taken from drffmpeg
Author: unknown

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 04:16:28 +02:00
Justin Ruggles 7d49f79f1c qdm2: check output buffer size before decoding 2011-10-03 21:34:19 -04:00
Laurent Aimar 5a19acb17c Fix out of bound reads in the QDM2 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-10-03 21:34:19 -04:00
Laurent Aimar 291d74a46d Check for out of bound writes in the QDM2 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-10-03 21:34:19 -04:00
Michael Niedermayer 2f9d6ffda7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  id3v2: remove pointless casts
  id3v2: read TXXX frames with two calls to decode_str() instead of one.
  id3v2: don't discard the whole tag when encountering empty frames.
  libvpx: fix build with older libvpx versions.
  ARM: check for inline asm 'y' operand modifier support

Conflicts:
	libavcodec/libvpxenc.c
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-04 03:24:59 +02:00
Justin Ruggles fc2dd2c7ac ogg/celt: do not set sample_fmt in the demuxer 2011-10-03 21:23:22 -04:00