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

31874 Commits

Author SHA1 Message Date
Reimar Döffinger 658a8bb988 VC-1: fix reading of custom PAR. 
Custom PAR num/denum are coded -1.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-14 00:05:36 +02:00
Reimar Döffinger eb8b325202 Support streaming .au files. 
FFmpeg writes data_size as AU_UNKNOWN_SIZE, make demuxer not
fail when data_size is set to this value.
Should fix trac issue #394.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-14 00:05:36 +02:00
Michael Niedermayer ca1dfea127 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: add dithering to yuv2yuvX_altivec_real
  rv34: free+allocate buffer instead of reallocating it to preserve alignment
  h264: add missing brackets.
  swscale: use 15-bit intermediates for 9/10-bit scaling.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 22:24:47 +02:00
Clément Bœsch 75af0e6a16 dv: honor timecode in DV muxer. 
This is based on the original work by Baptiste Coudurier.
 2011-08-13 19:13:03 +02:00
Clément Bœsch b49fe589ea mxf: honor timecode drop flag in mxf muxer if set. 2011-08-13 19:13:02 +02:00
Clément Bœsch b33ca05b46 mxf: add cli option in mxfenc to replace GOP timecode parsing. 
This is based on the original work by Baptiste Coudurier.
 2011-08-13 19:13:02 +02:00
Clément Bœsch 4c3c6e60f9 mxf: move framenum to timecode convert to timecode helpers. 
This is based on the original work by Baptiste Coudurier.
 2011-08-13 19:13:02 +02:00
Robert Krüger b7b72963e0 vf_unsharp: fix copy&paste error in chroma_amount param docs 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-13 16:45:13 +02:00
Stefano Sabatini ccd85b869d vf_unsharp: vertically align lines, for better readability 2011-08-13 16:45:13 +02:00
Stefano Sabatini 09603dcff8 vf_unsharp: store hsub/vsub in the filter context 
Also drop obfuscating CHROMA_WIDTH/HEIGHT macros.
 2011-08-13 16:45:13 +02:00
Stefano Sabatini 53e8638205 vf_unsharp: adopt a more natural order of params in apply_unsharp() 2011-08-13 16:45:13 +02:00
Stefano Sabatini 540181f8e2 vf_unsharp: rename method "unsharpen" to "apply_unsharp" 
More consistent with the original libmpcodecs code, and the name
"unsharpen" was confusing.
 2011-08-13 16:45:13 +02:00
Michael Niedermayer f8a1fc2623 ffmpeg: fix null pointer segfault on solaris. (ticket381) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 14:27:49 +02:00
Michael Niedermayer 36e0585a00 avconv: remove trailing whitespace 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 14:27:49 +02:00
Dominique Leuenberger 0a7164a191 set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
Thierry Foucu 1892052f8d mov: Set negative Sample_duration in STTS to 1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 03:39:58 +02:00
Michael Niedermayer 8c6b8cb4d1 doc/avconv.texi: fixup a few ff/av references 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 03:31:12 +02:00
Michael Niedermayer 0cb233cf46 Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 
* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
  Move x86util.asm from libavcodec/ to libavutil/.
  Move x86inc.asm to libavutil/.
  APIchanges: note error_recognition in lavf
  lavf: add support for error_recognition, use it in avidec, and bump minor API version
  avconv: change semantics of -map
  avconv: get rid of new* options.
  cmdutils: allow precisely specifying a stream for AVOptions.
  configure: add missing CFLAGS to fix building on the HURD
  libx264: Include hint for possible values for configuring libx264
  cmdutils: allow ':'-separated modifiers in option names.
  avconv: make -map_metadata work consistently with the other options
  avconv: remove deprecated options.
  avconv: make -map_chapters accept only the input file index.
  Make a copy of ffmpeg under a new name -- avconv.
  ffmpeg: add a warning stating that the program is deprecated.
  Add weighted motion compensation for RV40 B-frames
  RV3/4: calculate B-frame motion weights once per frame
  Move RV3/4-specific DSP functions into their own context
  mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
  h264: notice memory allocation failure

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	configure
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/libx264.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/version.h
	tests/lavf-regression.sh
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 02:56:08 +02:00
Michael Niedermayer 931187e117 ac3dec: export center & suroundmix levels 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 01:13:41 +02:00
Michael Niedermayer c4fd1d34ca av_get_string: search children too. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 01:06:16 +02:00
Michael Niedermayer bf71fb54b5 av_get_number: also search children, this is more sane than not doing so. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 01:06:15 +02:00
Michael Niedermayer 7b382ab6b0 opt_find: fix segfault 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 01:06:15 +02:00
Luca Barbato 3304a1e69a swscale: add dithering to yuv2yuvX_altivec_real 
It just does that part in scalar form, I doubt using a vector store
over 2 array would speed it up particularly.

The function should be written to not use a scratch buffer.
 2011-08-13 00:06:04 +02:00
Kostya Shishkov 78622ef362 rv34: free+allocate buffer instead of reallocating it to preserve alignment 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-12 13:49:25 -07:00
Ronald S. Bultje 28ca701e0b h264: add missing brackets. 
This caused failure of a few fate tests.
 2011-08-12 12:32:31 -07:00
Ronald S. Bultje 28c1115a91 swscale: use 15-bit intermediates for 9/10-bit scaling. 2011-08-12 11:54:25 -07:00
Ronald S. Bultje b2c087871d Move x86util.asm from libavcodec/ to libavutil/. 
This allows using it in swscale also.
 2011-08-12 11:43:03 -07:00
Ronald S. Bultje 3a39195b1d Move x86inc.asm to libavutil/. 
This allows using it in libswscale/ also.
 2011-08-12 11:43:02 -07:00
Dustin Brody e3a70c7c5f APIchanges: note error_recognition in lavf 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-12 19:12:53 +02:00
Dustin Brody 2f63440c59 lavf: add support for error_recognition, use it in avidec, and bump minor API version 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-12 19:10:22 +02:00
Anton Khirnov 8d2e4a7e68 avconv: change semantics of -map 
New syntax contains an optional stream type, allowing to refer to n-th
stream of specific type.

Omitting stream number now maps all streams of the given type.
 2011-08-12 19:10:22 +02:00
Anton Khirnov 3d4f0dab79 avconv: get rid of new* options. 
They are confusing, irregular and redundant -- -map already contains all
the information.  Stream maps can now be parsed in opt_output_file().

Add a more user-friendly default behavior in case no maps are present.

Breaks -programid for now, but it never worked properly anyway. A better
solution will be written soon.
 2011-08-12 19:10:22 +02:00
Anton Khirnov d4863fc1a8 cmdutils: allow precisely specifying a stream for AVOptions. 2011-08-12 18:35:12 +02:00
Michael Niedermayer 9f4d37f450 ac3enc: drop common fixed/float encoder 
User applications should by now be able to support float encoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-12 17:20:57 +02:00
Pino Toscano f60d136637 configure: add missing CFLAGS to fix building on the HURD 
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-12 14:11:21 +02:00
Reinhard Tartler 69c4bee8fa libx264: Include hint for possible values for configuring libx264 
The output of the x264 commandline tool contains the most uptodate
description of the possible values for the -preset, -tune and -profile
options.
 2011-08-12 14:09:59 +02:00
Anton Khirnov d70e512250 cmdutils: allow ':'-separated modifiers in option names. 2011-08-12 13:51:30 +02:00
Anton Khirnov e6e6060c9b avconv: make -map_metadata work consistently with the other options 
Before, it took an input and output file index, now it only takes an
input file and applies to the next output file.

Stream/chapter/program specification is now part of the option name and
the delimiter was changed from ',' to ':' to be consistent with the
similar feature for AVOptions.
 2011-08-12 13:50:36 +02:00
Anton Khirnov c9065c2917 avconv: remove deprecated options. 2011-08-12 13:30:38 +02:00
Anton Khirnov b9aac90bd8 avconv: make -map_chapters accept only the input file index. 
This is consistent with how all the other options work.
 2011-08-12 13:30:07 +02:00
Anton Khirnov 6291d7e416 Make a copy of ffmpeg under a new name -- avconv. 
It will be further developed with a few incompatible changes.

ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
 2011-08-12 13:27:30 +02:00
Anton Khirnov 791a86c37a ffmpeg: add a warning stating that the program is deprecated. 2011-08-12 13:27:20 +02:00
Kostya Shishkov b86ab38137 Add weighted motion compensation for RV40 B-frames 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:58 -07:00
Kostya Shishkov e5ec68699e RV3/4: calculate B-frame motion weights once per frame 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:23 -07:00
Kostya Shishkov d241f51e0f Move RV3/4-specific DSP functions into their own context 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:15 -07:00
Dustin Brody 21d7037234 mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:02:18 -07:00
Dustin Brody bac3ab13ea h264: notice memory allocation failure 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 15:59:07 -07:00
Michael Niedermayer d912e449b6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ac3enc: add macros for option names to make them more understandable.
  ac3enc: fix 'channel_coupling' option to actually allow 'auto'.
  cavs: fix some crashes with invalid bitstreams
  ac3enc: clip coupling coordinates during calculation
  Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.
  lavc: fix parentheses placement in avcodec_open2().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-11 20:39:20 +02:00
Michael Niedermayer 961a1a81d8 cavsdec: check run value validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-11 20:16:27 +02:00
Justin Ruggles c766eb1ce1 ac3enc: add macros for option names to make them more understandable. 2011-08-11 11:33:32 -04:00