generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
34,024 Commits 24 Branches 241 Tags 173 MiB
f0a7b67a35
Commit Graph

34024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f0a7b67a35 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcm: use sign_extend()
  mpeg12: fix mpeg_decode_slice context parameter type
  Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 23:45:44 +02:00
Nicolas George
f44c816566 libcelt_dec: set sample_fmt. 
This fixes a regression introduced by the merging of patch fc2dd2c.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 21:17:32 +02:00
Hendrik Leppkes
d1ee98c94b mpegts: add BDMV secondary audio stream types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 18:47:21 +02:00
Hendrik Leppkes
138d10969d avcodec: add YCgCo color space. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 18:43:46 +02:00
Hendrik Leppkes
84e0553c1c pcm_bluray: set bits_per_raw_sample for > 16-bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 18:41:03 +02:00
Hendrik Leppkes
463c8d8621 mpegts: fix null-pointer dereference 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 18:12:54 +02:00
Stefano Sabatini
d9d492513d vsrc_testsrc: increase log level from DEBUG to INFO for message in init() 2011-10-24 17:47:59 +02:00
Stefano Sabatini
1f4652068e lavfi: rewrite nullsrc using the code in vsrc_testsrc.c 
Factorize code, extend the functionality of the filter, and make it
return empty buffers. This is useful for filters which ignore the input
frames content.

This is also changing the syntax of the nullsrc source, and dropping the
framerate expression evaluation, which does not look particularly useful.
 2011-10-24 17:46:48 +02:00
Mark Himsley
3092509b08 filters.texi: document interlaced scaling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 17:18:17 +02:00
Lou Logan
3ac1ade118 docs: remove reference to enable-libavfilter 
This is no longer a valid configure option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 17:18:17 +02:00
Mans Rullgard
c8477df019 adpcm: use sign_extend() 
This avoids warnings from the overflow checker and simplifies the code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-24 15:26:24 +01:00
Andreas Öman
123b1fac5c wmall: Working bitstream parser 
(cherry picked from commit 929822111bc10fdf19ca66b7ed09e0ebf802878b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 15:55:57 +02:00
Anton Khirnov
d6b4f81721 tools: add a tool for enumerating/printing AVOptions in texinfo format 
(cherry picked from commit e103cb3e9513949858ccf0ec44c5151239d397e9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 14:18:07 +02:00
Michael Niedermayer
b616600516 sws: replace long by x86_reg in x86 asm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 12:23:51 +02:00
Michael Niedermayer
35075dc650 h264: Calculate a tighter recovery_frame. 
Reduces delay with mplayers TS demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 12:17:24 +02:00
Michael Niedermayer
63f0708478 h264: Support invalid output by mplayers TS demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 12:16:03 +02:00
Michael Niedermayer
9c020810c1 Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context" 
This reverts commit da22ba7df4.

Conflicts:

	libavcodec/mpeg12.c
	libavcodec/mpeg12.h
 2011-10-24 01:48:51 +02:00
Janne Grunau
d99fe3a478 mpeg12: fix mpeg_decode_slice context parameter type 
During slice threading only MpegEncContext is passed to
mpeg_decode_slice, remove a wrong cast and change the function
definition to take MpegEncContext pointer.
 2011-10-24 01:05:00 +02:00
Michael Niedermayer
fe906830fd Revert "mpeg12: move closed_gop from MpegEncContext to Mpeg1Context" 
This reverts commit 3fc0830432.
The revert is done because the reasoning behind the commit was
flawed, closed_gop is not mpeg1/2 specific.

Conflicts:

	libavcodec/mpeg12.c
	libavcodec/mpeg12.h
 2011-10-24 01:04:14 +02:00
Michael Niedermayer
2b0cdb7364 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Move id3v2 tag writing to a separate file.
  swscale: add missing colons to x86 assembly yuv2planeX.
  g722: split decoder and encoder into separate files
  cosmetics: remove extra spaces before end-of-statement semi-colons
  vorbisdec: check output buffer size before writing output
  wavpack: calculate bpp using av_get_bytes_per_sample()
  ac3enc: Set max value for mode options correctly
  lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
  mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
  mpeg12: move full_pel from MpegEncContext to Mpeg1Context
  mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
  mpegvideo: remove some unused variables from MpegEncContext.

Conflicts:
	libavcodec/mpeg12.c
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 01:01:21 +02:00
Janne Grunau
cd8c64e197 Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context" 
This reverts commit da22ba7df4 since it
broke slice threading. Slice threading just duplicates MpegEncContext
so every value used during mpeg_decode_slice has to be in it.
A second patch will fix the illusion that Mpeg1Context is available
in mpeg_decode_slice.
 2011-10-24 00:59:41 +02:00
Stefano Sabatini
42d44ec306 vsrc_testsrc: do not assume non-padded lines in test_fill_picture() 
In particular, fix sliding color bar with padded data, for example with
testsrc,pad=iw+200:ih.
 2011-10-23 23:54:37 +02:00
Stefano Sabatini
1679a40b74 vf_boxblur: fix slice-drawing 
This filter does not support slice-drawing, the whole blurred image needs
to be written in end_frame().
 2011-10-23 23:54:37 +02:00
Michael Niedermayer
9eb867e117 sws: add yuv2yuvX_sse3() 
Code is about 2x as fast as previous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 23:36:06 +02:00
Michael Niedermayer
f4bf06eb96 sws-test: Fix data alignment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 23:35:28 +02:00
Michael Niedermayer
90640cc764 sws: fix assert failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 20:18:21 +02:00
Michael Niedermayer
8b4b2ddf8d sws: x86_32 fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 20:15:37 +02:00
Michael Niedermayer
76a3490672 sws: add yuv2yuvX() back and updated to the just 1 plane API 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 19:31:55 +02:00
Michael Niedermayer
74fdb7a0f8 sws: factorize v*Filter use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 19:22:58 +02:00
Michael Niedermayer
4d31f42020 sws: port to thw new 1 plane API and add back yuv2yuv1_ar(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 19:22:58 +02:00
Michael Niedermayer
f15359727d sws: better MOVNTQ macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 19:22:58 +02:00
Michael Niedermayer
b6dcd6dfcc sws cleanup yuv2planeX_10_c_template() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 19:22:58 +02:00
Michael Niedermayer
b1a4b735f9 sws: remove nonsensical code that leaked in from libav 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 19:22:58 +02:00
Michael Niedermayer
1c26f2da81 sws: drop unused code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 19:22:58 +02:00
Michael Karcher
16ad77b357 Move id3v2 tag writing to a separate file. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-23 19:17:53 +02:00
Ronald S. Bultje
9e66b892e8 swscale: add missing colons to x86 assembly yuv2planeX. 
This fixes assembling using "nasm".
 2011-10-23 09:44:03 -07:00
Justin Ruggles
704721bc9c g722: split decoder and encoder into separate files 2011-10-23 11:42:34 -04:00
Justin Ruggles
b95fbba705 cosmetics: remove extra spaces before end-of-statement semi-colons 2011-10-23 11:36:56 -04:00
Justin Ruggles
60aa1a358d vorbisdec: check output buffer size before writing output 2011-10-23 11:36:56 -04:00
Justin Ruggles
d2604f9260 wavpack: calculate bpp using av_get_bytes_per_sample() 2011-10-23 11:35:46 -04:00
John Stebbins
ddfb8e1adb ac3enc: Set max value for mode options correctly 
for example:
Attempting to set ac3 dsur_mode to "on" results in:
[AC-3 Encoder @ 0x7f508f0a3280] Value 2.000000 for parameter 'dsur_mode' out of range
[AC-3 Encoder @ 0x7f508f0a3280] Error setting option dsur_mode to value on.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-10-23 11:30:54 -04:00
Reimar Döffinger
4a5ea9e0ce Simplify some bits-left/overread checks. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-23 14:27:39 +02:00
Anton Khirnov
1deb66c50c lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c 
It's not used anywhere else.
 2011-10-23 14:16:16 +02:00
Anton Khirnov
3fc0830432 mpeg12: move closed_gop from MpegEncContext to Mpeg1Context 
It's MPEG-1/2 specific.
 2011-10-23 14:15:56 +02:00
Anton Khirnov
da22ba7df4 mpeg12: move full_pel from MpegEncContext to Mpeg1Context 
It's MPEG-1 specific.
 2011-10-23 14:14:39 +02:00
Anton Khirnov
cc05a45d33 mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h 
It will be used in vdpau code.
 2011-10-23 14:14:34 +02:00
Anton Khirnov
acffe45732 mpegvideo: remove some unused variables from MpegEncContext. 2011-10-23 14:13:40 +02:00
Michael Niedermayer
67341f6a77 lavc: add PIX_FMT_GBR24P to align_dimensions() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 13:45:20 +02:00
Reimar Döffinger
6f5b4ce612 Reuse vp3_decode_flush instead of duplicating it. 
This also fixes that sometimes a frame would actually not be freed.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-23 13:25:51 +02:00
Michael Niedermayer
1ac5b51203 swscale: disable functions that do not yet work 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 05:14:15 +02:00