x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-06 14:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,955 Commits 40 Branches 430 Tags
9e8dff90efa3faae5ac07fa5fae7e154367e24fd
Commit Graph
33955 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Mans RullgardandMichael Niedermayer 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 RullgardandMichael Niedermayer 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 RullgardandMichael Niedermayer 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 RullgardandMichael Niedermayer 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 RullgardandMichael Niedermayer 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 RullgardandMichael Niedermayer 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
Michael Niedermayer 364f367921 avcodec: add ifdef from qatar that could not be merged previously due to compilation failure. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 16:51:40 +02:00
Nicolas GeorgeandMichael Niedermayer 0e138745f7 codec_names: invoke preprocessor on avcodec.h. 
This fixes failures when codec IDs are defined conditionally,
for example when scheduling for a major bump.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 16:49:49 +02:00
Michael Niedermayer 9ab5e64897 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: reallocate SDL overlays for OSX when changing full screen

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 16:38:16 +02:00
Michael Niedermayer d8cae42d72 Merge remote-tracking branch 'mans/ac3' 
* mans/ac3:
  ac3enc: slightly faster quantize_mantissas_blk_ch()
  ac3enc: NEON optimised sum_square_butterfly_float
  ac3enc: neon optimised sum_square_butterfly_int32
  ac3enc: move inner loop of compute_rematrixing_strategy to ac3dsp

Conflicts:
	libavcodec/ac3enc_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 11:11:08 +02:00
Michael Niedermayer d3d97d43d5 sws: fix warning: new qualifiers in middle of multi-level non-const cast are unsafe warning. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 05:21:01 +02:00
Carl Eugen Hoyos 415f3ceac1 Fix comment: Enhanced AC-3 in mov is defined in ETSI TS 102 366. 2011-10-22 02:23:56 +02:00
Michael Niedermayer 8646d610ff pulse: fix application name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 02:11:50 +02:00
Michael Niedermayer 5b602a140f Merge remote-tracking branch 'luzero/pulse' 
* luzero/pulse:
  pulse: cosmetics
  pulse: introduce pulseaudio input

Conflicts:
	Changelog
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 01:56:57 +02:00
Michael Niedermayer d000c5ae7e configure: move code out of main of check_exec_crash() 
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 01:51:29 +02:00
Lou LoganandMichael Niedermayer 1e09d9085d Remove redundant libx264 preset files 
These are available via -preset or -vprofile and the addition of
-qp 0 or -crf 0 if lossless is desired.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 01:32:10 +02:00
Michael Niedermayer aedc908601 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  flvdec: Do not call parse_keyframes_index with a NULL stream
  libspeexdec: include system headers before local headers
  libspeexdec: return meaningful error codes
  libspeexdec: cosmetics: reindent
  libspeexdec: decode one frame at a time.
  swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables()
  Move timefilter code from lavf to lavd.
  mov: add support for hdvd and pgapmetadata atoms
  mov: rename function _stik, some indentation cosmetics
  mov: rename function _int8 to remove ambiguity, some indentation cosmetics
  mov: parse the gnre atom
  mp3on4: check for allocation failures in decode_init_mp3on4()
  mp3on4: create a separate flush function for MP3onMP4.
  mp3on4: ensure that the frame channel count does not exceed the codec channel count.
  mp3on4: set channel layout
  mp3on4: fix the output channel order
  mp3on4: allocate temp buffer with av_malloc() instead of on the stack.
  mp3on4: copy MPADSPContext from first context to all contexts.
  fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm
  fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm
  ...

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_ps.c
	libavcodec/h264dsp_template.c
	libavcodec/h264idct_template.c
	libavcodec/h264pred.c
	libavcodec/h264pred_template.c
	libavcodec/x86/h264dsp_mmx.c
	libavdevice/Makefile
	libavdevice/jack_audio.c
	libavformat/Makefile
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavutil/pixfmt.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 01:16:41 +02:00
Reimar DöffingerandMartin Storsjö f4b51d061f flvdec: Do not call parse_keyframes_index with a NULL stream 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-10-22 00:59:33 +03:00
Justin Ruggles b19e0c2b4e libspeexdec: include system headers before local headers 2011-10-21 17:07:05 -04:00
Justin Ruggles a470fe80ba libspeexdec: return meaningful error codes 2011-10-21 17:07:04 -04:00
Justin Ruggles 14bc60dbae libspeexdec: cosmetics: reindent 2011-10-21 17:07:04 -04:00
Justin Ruggles 7eeaa6796b libspeexdec: decode one frame at a time. 
This allows for knowing the output size before decoding even when there is no
header (e.g. FLV). Otherwise we would have to do a preliminary full frame
decode to determine the number of frames-per-packet.
 2011-10-21 17:07:04 -04:00
Hendrik LeppkesandMichael Niedermayer 1a7090bfaf mov: support eac3 audio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:52:55 +02:00
Michael Niedermayer a0a4b13322 mpegts: remove read_seek() 
Its redundant

Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:35:07 +02:00
Michael Niedermayer 08d4408a90 utils: disable debuging code at the end of av_gen_search() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:27:02 +02:00
Michael Niedermayer f73f68b894 utils: flush on successfull av_seek_frame_binary() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:26:13 +02:00
Mans Rullgard 41ac093f7e swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-21 20:56:59 +01:00
Michael Niedermayer db1347f66e mpegts: cache information to speed up seeking. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 21:13:20 +02:00
Michael Niedermayer 27f7589ab1 seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random 
points but rather seek to the min/max.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 20:45:00 +02:00
Anton Khirnov 5dd35b43f1 Move timefilter code from lavf to lavd. 
It's only used in the JACK device.

Fixes linking shared lavd with JACK enabled.
 2011-10-21 20:29:05 +02:00
Raivo HoolandAnton Khirnov b06df70755 mov: add support for hdvd and pgapmetadata atoms 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-21 20:29:05 +02:00
Raivo HoolandAnton Khirnov 5da35d1cb3 mov: rename function _stik, some indentation cosmetics 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-21 20:29:05 +02:00
Raivo HoolandAnton Khirnov 80951f5cf6 mov: rename function _int8 to remove ambiguity, some indentation cosmetics 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-21 20:29:02 +02:00
Raivo HoolandAnton Khirnov 94395fbf8c mov: parse the gnre atom 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-21 19:50:51 +02:00
Justin Ruggles 95891804bf mp3on4: check for allocation failures in decode_init_mp3on4() 2011-10-21 12:34:43 -04:00
Justin Ruggles 180bf988bc mp3on4: create a separate flush function for MP3onMP4. 
The correct decoder private context needs to be used.
This fixes mp3on4 playback and seeking in avplay.
 2011-10-21 12:33:15 -04:00
Justin Ruggles 53c8443ad2 mp3on4: ensure that the frame channel count does not exceed the codec channel 
count.

This also allows for checking output data size based on the actual
number of channel instead of the maximum number of channels.
 2011-10-21 12:32:35 -04:00
Justin Ruggles 1183d6cd98 mp3on4: set channel layout 2011-10-21 12:29:51 -04:00
Justin Ruggles fff0f831e0 mp3on4: fix the output channel order 2011-10-21 12:29:51 -04:00
Justin Ruggles f507dd067a mp3on4: allocate temp buffer with av_malloc() instead of on the stack. 
Avoids allocating unnecessary memory and ensures proper alignment.
 2011-10-21 12:29:51 -04:00
Justin Ruggles cb72230dfa mp3on4: copy MPADSPContext from first context to all contexts. 
Fixes segfault when decoding multi-channel MP3onMP4 files.
 2011-10-21 12:29:51 -04:00
Michael Niedermayer 7846280d1d mpegts: assert position in dts reading code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 18:06:18 +02:00
Michael Niedermayer de9862a95e mpegts: add and use mpegts_get_dts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 18:06:18 +02:00
Michael Niedermayer 04ac0d7994 mpegts: fix type of argument of mpegts_resync() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 18:06:18 +02:00
Justin Ruggles aad3429d4e fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm 2011-10-21 10:13:05 -04:00
Justin Ruggles 4e8e262476 fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm 2011-10-21 10:13:05 -04:00
Justin Ruggles 185142a5ea fmtconvert: check compile-time x86 instruction set flags 2011-10-21 10:13:05 -04:00
Justin Ruggles 708ab7dd69 fmtconvert: port float_to_int16() x86 inline asm to yasm 2011-10-21 10:13:05 -04:00