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

33663 Commits

Author SHA1 Message Date
JULIAN GARDNER d5f4857a73 dvbsubdec:dvbsub_display_end_segment() move main loop under if() as its useless if false. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 20:16:31 +02:00
Carl Eugen Hoyos 5a563c6319 Support H264 from QNAP Systems. 2011-10-15 18:28:32 +02:00
Michael Niedermayer 2ed7e353bd h264: Workaround invalid flag combinations of 8x8 inference. 
Fixes Ticket555

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 15:38:10 +02:00
Stefano Sabatini 1d0afec8fc ffprobe: add AVClass to writers 
It is useful for logging messages from a writer context.
 2011-10-15 00:54:22 +02:00
Michael Niedermayer bd4ebbbbed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresdsp: fix function prototypes.
  prores-idct: fix overflow in c code.
  fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
  prores: add missing feature warning for alpha
  mov: 10l: Terminate string with 0 not '0'
  mov: Prevent illegal writes when chapter titles are very short.
  prores: add appropriate -fix_fmt parameter to FATE command
  riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
  lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
  lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Conflicts:
	libavcodec/avcodec.h
	libavformat/mov.c
	tests/fate/prores.mak
	tests/ref/acodec/g726
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 22:24:00 +02:00
Michael Niedermayer 4b9e9a57ee proresdec: rename to avoid confusion 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 21:45:14 +02:00
Ronald S. Bultje 05c8f119cc proresdsp: fix function prototypes. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:34:46 +02:00
Ronald S. Bultje f78cd0c243 prores-idct: fix overflow in c code. 
Fix the fate ref for prores-422_proxy by reverting the changes to it
in commit f492df0927

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:34:20 +02:00
Janne Grunau 8aa80ec5e3 fate: update prores-alpha ref after changing pix_fmt to yuv444p10le 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:33:01 +02:00
Janne Grunau 19ec283f49 prores: add missing feature warning for alpha 2011-10-14 21:07:53 +02:00
JULIAN GARDNER 0f8d77199a dvbsubdec: add version checking 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:20:00 +02:00
JULIAN GARDNER 1fc7b0ed5a dvbsubdec: handle mode change page state 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER 168a5d3b3c dvbsubdec: change the top_bottom correction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER f12c7ad86d dvbsubdec: fix buf ptr in dvbsub_parse_region_segment() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER 7e0f4f9d0f dvbsubdec: bottom_field_len fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER 55f17d3175 dvbsubdec: fix x/y_pos checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER 24fb1b64a6 dvbsubdec: outcomment debug stuff in dvbsub_parse_pixel_data_block() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER b522d2a3b7 dvbsubdec: dirty handkling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER eea064aea6 dvbsubdec: Fix variable increments & checking in dvbsub_read_*bit_string() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:12:40 +02:00
Michael Niedermayer 337496980e prores: use C idct for fate as the SSE code is not matching the SSE* code down at the bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 19:48:41 +02:00
Alex Converse 7ad06beb2c mov: 10l: Terminate string with 0 not '0' 2011-10-14 10:38:42 -07:00
Alex Converse 8fb22c3d47 mov: Prevent illegal writes when chapter titles are very short. 2011-10-14 10:36:18 -07:00
Diego Biurrun f492df0927 prores: add appropriate -fix_fmt parameter to FATE command 
Also correct CRCs for Sequence_1-Apple_ProRes_422_Proxy.mov, previous
CRCs were generated with the non-bitexact x86_64 assembler IDCT.
 2011-10-14 18:17:34 +02:00
Michael Niedermayer 530d8529d0 fate: enable the prores tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 14:08:28 +02:00
John Brooks 2c4e08d893 riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 
The cbSize field should be included in all cases, even with PCM where
its value is ignored.

Fixes encoding PCM audio in Matroska for some players which insist on
a full WAVEFORMATEX structure for A_MS/ACM audio.

Since fate uses wav files for the audio test a larger number of tests
has changed checksums or shifted positions due to the 2 byte longer
wave header.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 13:28:58 +02:00
Dustin Brody 582f231142 lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-14 09:00:21 +02:00
Dustin Brody ac90a71459 lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-14 09:00:04 +02:00
Michael Niedermayer 91eb1b1525 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  prores: add FATE tests
  id3v2: reduce the scope of some non-globally-used symbols/structures
  id3v2: cosmetics: move some declarations before the places they are used
  shorten: remove the flush function.
  shn: do not allow seeking in the raw shn demuxer.
  avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
  avformat: update AVInputFormat allowed flags
  avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
  truespeech: use sizeof() instead of hardcoded sizes
  truespeech: remove unneeded variable, 'consumed'
  truespeech: simplify truespeech_read_frame() by using get_bits()
  truespeech: decode directly to output buffer instead of a temp buffer
  truespeech: check to make sure channels == 1
  truespeech: check for large enough output buffer rather than truncating output
  truespeech: remove unneeded zero-size packet check.
  mlpdec: return meaningful error codes instead of -1
  mlpdec: remove unnecessary wrapper function
  mlpdec: only calculate output size once
  mlpdec: validate that the reported channel count matches the actual output channel count
  pcm: reduce pointer type casting
  ...

Conflicts:
	libavformat/avformat.h
	libavformat/id3v2.c
	libavformat/id3v2.h
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 03:48:22 +02:00
Michael Niedermayer 90705aabe1 cmdutils.h: Project name cleanup 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 02:18:55 +02:00
Michael Niedermayer e9adeeec98 cmdutils: Fix loglevel for -debug 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 02:18:55 +02:00
Michael Niedermayer 8937afd39f proresdec: set CODEC_CAP_DR1, it appears this was forgotten. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 02:18:55 +02:00
Michael Niedermayer da31e537c4 opt: handle AV_OPT_TYPE_CONST too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 02:18:55 +02:00
Diego Biurrun a62d36697d prores: add FATE tests 2011-10-13 23:20:39 +02:00
Diego Biurrun c4a378855e id3v2: reduce the scope of some non-globally-used symbols/structures 2011-10-13 23:20:37 +02:00
Diego Biurrun 3b78c180e4 id3v2: cosmetics: move some declarations before the places they are used 2011-10-13 23:20:35 +02:00
Justin Ruggles 617a51f9b7 shorten: remove the flush function. 
The shorten decoder does not support seeking.
 2011-10-13 16:31:16 -04:00
Justin Ruggles e32dfdaa8d shn: do not allow seeking in the raw shn demuxer. 
The demuxer does not read the seektable, a parser is not possible without a
full decode, and no shorten decoder can handle random seeking because it needs
side info from the seektable.
 2011-10-13 16:31:16 -04:00
Justin Ruggles b631fba936 avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK. 
This will prevent seeking by bytes for formats that cannot handle this.
 2011-10-13 16:31:15 -04:00
Justin Ruggles 050e20aee6 avformat: update AVInputFormat allowed flags 2011-10-13 16:31:15 -04:00
Justin Ruggles 0041cdba98 avformat: don't unconditionally call ff_read_frame_flush() when trying to seek. 
This prevents flushing the packet buffer when the input format does not
support seeking.
 2011-10-13 16:31:15 -04:00
Justin Ruggles c6ac30c84b truespeech: use sizeof() instead of hardcoded sizes 2011-10-13 16:26:00 -04:00
Justin Ruggles 6d55506c8b truespeech: remove unneeded variable, 'consumed' 
increment the 'buf' pointer instead, and consume the whole packet.
 2011-10-13 16:26:00 -04:00
Justin Ruggles b84048935e truespeech: simplify truespeech_read_frame() by using get_bits() 2011-10-13 16:25:59 -04:00
Justin Ruggles 5e5ce70f19 truespeech: decode directly to output buffer instead of a temp buffer 2011-10-13 16:25:59 -04:00
Justin Ruggles 3e7a176759 truespeech: check to make sure channels == 1 2011-10-13 16:25:59 -04:00
Justin Ruggles a8f8db2636 truespeech: check for large enough output buffer rather than truncating output 2011-10-13 16:25:59 -04:00
Justin Ruggles 595cf1a1aa truespeech: remove unneeded zero-size packet check. 
This is already checked in avcodec_decode_audio3()
 2011-10-13 16:25:59 -04:00
Justin Ruggles 82be06bbb3 mlpdec: return meaningful error codes instead of -1 2011-10-13 15:13:02 -04:00
Justin Ruggles e1b8d88d52 mlpdec: remove unnecessary wrapper function 2011-10-13 15:13:02 -04:00
Justin Ruggles 37b67f1bff mlpdec: only calculate output size once 2011-10-13 15:13:02 -04:00