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

35504 Commits

Author SHA1 Message Date
Justin Ruggles d1241ff3b2 avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3() 2011-12-04 18:29:51 -05:00
Alex Converse 6d23d19729 mov: Allow empty stts atom. 
Fixes regressions caused by 30c3d976
 2011-12-04 15:20:48 -08:00
Michael Niedermayer 707138593a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
	Changelog
	libavcodec/adpcmenc.c
	libavcodec/bmp.c
	libavcodec/zmbv.c
	libavutil/log.c
	libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-05 00:11:57 +01:00
Diego Biurrun def5dc1260 doc: document preferred Doxygen syntax and make patcheck detect it 2011-12-04 23:49:48 +01:00
Chris Berov dc6d043050 adpcmenc: cosmetics: pretty-printing 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-04 17:07:48 -05:00
Chris Berov 541d083a40 ac3dec: cosmetics: pretty-printing 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-04 16:15:48 -05:00
Chris Berov a4e21baa74 yuv4mpeg: cosmetics: pretty-printing 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-04 15:58:40 -05:00
Stefano Sabatini 2f8b6e909d lavfi: add life source 2011-12-04 21:18:37 +01:00
Stefano Sabatini 6c26fe8b5a aevalsrc: add duration option 2011-12-04 21:13:22 +01:00
Paul B. Mahol eda8731285 shorten: remove dead initialization 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-04 15:12:05 -05:00
Peter Ross ba8410cb44 Microsoft Windows ICO demuxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 16:44:20 +01:00
Reimar Döffinger 7679bd6e60 roqvideodec: set AVFrame reference before reget_buffer. 
Otherwise it might return a write-only frame which would break
decoding completely.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-04 16:04:27 +01:00
Carl Eugen Hoyos 1e92d58e44 bmp: fix some 1bit samples. 
<= 8bpp BMP images always have palette.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-04 16:04:27 +01:00
Janne Grunau 8dd92eca74 latmdec: add fate test for audio config change 2011-12-04 15:38:14 +01:00
Michael Niedermayer b4425f26bb doc/filters.texi: Update drawtext docs so that the documented input width/height variables are compatible with qatar. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 15:31:58 +01:00
Michael Niedermayer dda3d716d6 vf_drawtext: support W/H parameters to reduce UI differences to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 15:29:26 +01:00
Michael Niedermayer 594090c6c2 ffmpeg: select best pixel format for the encoder if no exact match. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 15:26:52 +01:00
David Goldwich c8b27a0ec4 oma: PCM support 
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-04 15:21:06 +01:00
David Goldwich 8ae5eb75df oma: better format detection with small probe buffer 
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-04 15:20:10 +01:00
David Goldwich e96070074d oma: clearify ambiguous if condition 
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-04 15:19:51 +01:00
Michael Niedermayer f88d5df383 vf_drawtext: cosmetics to reduce diff to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 02:27:45 +01:00
Michael Niedermayer 297422b338 vf_drawtext: Add main_w/h to improve compatibility with the modified UI 
from the fork.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 02:08:56 +01:00
Michael Niedermayer fb266f5973 h264: show when has_b_frames is being increased. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 01:41:22 +01:00
Michael Niedermayer 7f92f3d812 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: fix frame reordering code.
  fate: Add a test for the VBLE decoder
  doc: break some long lines in developer.texi
  drawtext: make x and y parametric
  drawtext: manage memory allocation better
  drawtext: refactor draw_text
  doc: remove space between variable and post increment in example code

Conflicts:
	doc/developer.texi
	doc/filters.texi
	libavcodec/h264.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 01:02:37 +01:00
Derek Buitenhuis a548b6cbfc wavpack: Properly clip samples during lossy decode 
When decoding lossy WavPack samples, they are supposed
to be clipped, in order to be decoded correctly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 15:32:21 -08:00
Yordan Makariev 425b45d4b0 Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 15:13:48 -08:00
Tsvetelina Borisova 4a59eca97a Cleaned pixdesc.c file in libavutil 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 14:36:11 -08:00
Nathan Adil Maxson 8f8c785ffc zmbv.c: coding style clean-up. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 14:11:39 -08:00
Nathan Adil Maxson 6eedeefe0b xan.c: coding style clean-up. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 14:11:26 -08:00
Konstantin Todorov 363114e813 mpegvideo.c: code cleanup - first 500 lines. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 14:03:27 -08:00
Michael Niedermayer ff53c79d0a flvdec: Stop searching for streams once a audio & a video stream has been found 
instead of when the 2nd stream has been found.
This isnt ideal as we will likely still like before miss a data stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 21:39:53 +01:00
Reimar Döffinger 85372f9d57 Add forgotten %ifdef HAVE_AVX. 
Fixes compilation with older YASM/NASM versions.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-03 20:46:42 +01:00
Ronald S. Bultje adedd840e2 h264: fix frame reordering code. 
Fixes fate-h264-conformance-{mr2_tandberg_e,mr3_tandberg_b} without
requiring -strict 1.
 2011-12-03 08:24:27 -08:00
Nicolas George 976b095939 lavu/error: define AVERROR_BUG. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 15:18:58 +01:00
Nicolas George 757cb3b46a avutil: av_x_if_null: remove const for the return value. 
This is the usual weirdness with const/non-const pointers through a function.
See the prototype of strchr for a standard example.

The function had to be moved down, below the point where stdint.h is
indirectly included.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 15:18:15 +01:00
Michael Niedermayer 730945d941 ffmpeg: use standard duration calculation code in the stream copy case. 
Fixes a.mkv non monotonic timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 15:15:06 +01:00
ami_stuff 28a11a67d2 BMP: Support BMP OS/2 v2 with RLE compression. 
Fixes ticket #699.

Patch also provided by Peter Ross.
 2011-12-03 12:34:12 +01:00
Carl Eugen Hoyos 8dcd2a41ec Allow last mov chunk to have an arbitrary number of samples. 
Fixes ticket #673.
 2011-12-03 12:29:41 +01:00
Carl Eugen Hoyos 88bbabcc00 Support decoding right-to-left targa files. 
Fixes ticket #698.
 2011-12-03 12:22:12 +01:00
Nicolas George 90bfd511c4 celtdec: adapt to avcodec_decode_audio4. 
Original fix by Michael Niedermayer.
Slightly modified to avoid the now redundant multiplications
and divisions in the main code path.
 2011-12-03 11:54:30 +01:00
Michael Niedermayer a930cd0d19 oma: Fix out of array read. 
Input: 01-Untitled-partial.oma
ZZUF params: zzuf[s=7157,r=0.001]

Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 05:27:04 +01:00
Michael Niedermayer aedd30b63a id3v2: Fix null ptr crash in get_extra_meta_func() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 05:12:56 +01:00
Michael Niedermayer 8bd2b27f6b zmbv: fix 2 memleaks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 04:50:35 +01:00
Michael Niedermayer 3eb6e14618 zmbv: Fix keyframe fault protextion. 
Fixes zzuf -s467 -r0.001 cat samples/zmbv/wc2_001-partial.avi

Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 04:49:08 +01:00
Michael Niedermayer 7a5eb40ea1 audeo_get_buffer: fix pkt_pos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 04:42:24 +01:00
Michael Niedermayer acf22ec69e developer.texi: Fix naming convention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 03:46:14 +01:00
Peter Ross 52b7ed4f6e iff: support ExtraHalfBrite (EHB) palette mode 
Fixes ticket #663.

Based on patch by ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 03:46:14 +01:00
Peter Ross 56f6628bca pictordec: decode 8bpp images when extra header marker is missing 
Fixes ticket #696.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 03:46:14 +01:00
Carl Eugen Hoyos 2d6a45c12a Silence warnings when decoding QNAP Systems H264 codec. 
Fixes ticket #571.
 2011-12-03 03:34:23 +01:00
Clément Bœsch 215b7724e7 lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00