RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
34,008 Commits 36 Branches 392 Tags 215 MiB
Commit Graph

34008 Commits

Author SHA1 Message Date
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
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
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
Michael Niedermayer f97faf6751 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays
  VC1: restore mistakenly removed code
  twinvq: check output buffer size before decoding
  twinvq: return an error when the packet size is too small
  lavf: export some forgotten symbols with non-av prefixes.
  swscale: update altivec yuv2planeX asm to new per-plane API.
  swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware.
  yuv2planeX10 SIMD
  swscale: decide whether to use yuv2plane1/X on a per-plane basis.
  swscale: reintroduce full precision in 16-bit output.
  Split up yuv2yuvX functions
  Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions
  lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
  lavc: translate non-flag-based er options into flag-based ef options at codec open
  add -err_filter AVOptions to access flag-based error recognition
  h264_weight: initialize "height" function argument properly.
  presets: spelling error in libvpx 1080p50_60
  avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X

Conflicts:
	ffplay.c
	libavformat/libavformat.v
	libswscale/swscale.c
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-23 05:13:56 +02:00
Carl Eugen Hoyos 9e8dff90ef Revert "mov: do not misreport empty stts" 
Fixes ticket #578.

This reverts commit 30c3d976f1.
 2011-10-23 00:54:56 +02:00
Michael Karcher e71ebb1972 id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-22 22:52:18 +02:00
Mashiat Sarker Shakkhar f18746528d VC1: restore mistakenly removed code 
The code was mistakenly removed in cad16562c8.
It stored some motion vector data for future use in B-pictures.

This fixes Bugzilla bug #57.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-22 22:51:00 +02:00
Michael Niedermayer e60779b18c Merge remote-tracking branch 'mans/dnxhd' 
* mans/dnxhd:
  dnxhddec: cache luma/chroma_weight*qscale tables for last qscale
  dnxhddec: merge ac_{index,run}_flags
  dnxhddec: store 2*level+1 in ac_level tables
  dnxhddec: rearrange decode_dct_block loop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 22:18:12 +02:00
Justin Ruggles e53eecd0e7 twinvq: check output buffer size before decoding 2011-10-22 15:38:05 -04:00
Justin Ruggles 5ed6817822 twinvq: return an error when the packet size is too small 2011-10-22 15:38:05 -04:00
Anton Khirnov 07e1256456 lavf: export some forgotten symbols with non-av prefixes. 2011-10-22 21:08:31 +02:00
Mans Rullgard 22aebf1bfe Add rule for compiling to asm 
This allows commands of the form "make foo.s", which is useful
for inspecting the compiler output for debugging purposes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 20:49:24 +02:00
Mans Rullgard e40cde01dc vorbisenc: simplify floor_classes[] table 
This avoids an indirection in the table.  Data size is slightly
smaller on 64-bit systems, 8 bytes larger on 32-bit.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 214a85202b2eedbef06357e40278c2f56aa2c6e3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 20:46:56 +02:00
Mans Rullgard d4999e0a79 dca: ARMv6 optimised decode_blockcode() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 08e3dea3f7f69309574dafc0af6671615e909720)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 20:28:45 +02:00
Mans Rullgard ab2539708a Check for cbrtf() and provide fallback 
(cherry picked from commit bfb37d7db1c6394099f6b177e10d6e769e678f6a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 19:49:27 +02:00
Mans Rullgard 9c48a7cc52 ratecontrol: replace VLAs with malloc/free 
(cherry picked from commit 2c6bd7d1f992989d1cc108534e0896771b86824f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 19:45:31 +02:00
Mans Rullgard 39b0165f9e er: replace VLA with malloc/free 
(cherry picked from commit 5c2d016a85453f121285d125ed049a8cf492855a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 19:45:22 +02:00
Ronald S. Bultje f48b12e0a6 swscale: update altivec yuv2planeX asm to new per-plane API. 2011-10-22 10:35:14 -07:00
Ronald S. Bultje 6cacecdca3 swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware. 
Also implement MMX/MMX2 versions and SSE4 versions.
 2011-10-22 10:35:14 -07:00