generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,808 Commits 24 Branches 241 Tags
Commit Graph

15122 Commits

Author SHA1 Message Date
Diego Biurrun
aebb56e184 Replace some commented-out debug printf() / av_log() messages with av_dlog(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 01:31:03 +02:00
Michael Niedermayer
0ed7bc49a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  libx264: set default thread count to 0 (auto)
  lavc: cosmetics, group deprecated codec flags
  mpeg12: add 'scan_offset' private option.
  h263/p encoder: add 'structured_slices' private option.
  h263/p encoder: add 'obmc' private option.
  h263p encoder: add 'aiv' private option.
  h263p encoder: add 'umv' private option.
  mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
  mjpegdec: add 'extern_huff' private option.
  mpeg4enc: add 'data_partitioning' private option.
  snow: add 'memc_only' private option.
  libx264: add 'mbtree' private option.
  libx264: add 'psy' private option.
  libmp3lame: add 'reservoir' private option.
  mpeg2enc: add 'non_linear_quant' private option
  mpeg12enc: add drop_frame_timecode private option.
  mpeg12enc: add intra_vlc private option.
  VC1: Support dynamic dimension changes
  mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
  lavc: deprecate CODEC_FLAG2_BRDO
  ...

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/libx264.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.h
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 00:01:21 +02:00
Anton Khirnov
5d06f15235 libx264: set default thread count to 0 (auto) 2011-08-31 17:39:13 +02:00
Anton Khirnov
f013cb8118 lavc: cosmetics, group deprecated codec flags 2011-08-31 13:28:54 +02:00
Anton Khirnov
aed7900704 mpeg12: add 'scan_offset' private option. 
Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
 2011-08-31 13:28:41 +02:00
Anton Khirnov
4bcee8e7f8 h263/p encoder: add 'structured_slices' private option. 
Deprecate CODEC_FLAG_H263P_SLICE_STRUCT
 2011-08-31 13:28:26 +02:00
Anton Khirnov
0d904de89d h263/p encoder: add 'obmc' private option. 
Deprecate CODEC_FLAG_OBMC
 2011-08-31 13:28:11 +02:00
Anton Khirnov
e3922d1110 h263p encoder: add 'aiv' private option. 
Deprecate CODEC_FLAG_H263P_AIV
 2011-08-31 13:27:59 +02:00
Anton Khirnov
9bb2d1a3f0 h263p encoder: add 'umv' private option. 
Deprecate CODEC_FLAG_H263P_UMV
 2011-08-31 13:27:36 +02:00
Anton Khirnov
0e5d37309f mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. 
Deprecate CODEC_FLAG_ALT_SCAN
 2011-08-31 13:26:26 +02:00
Anton Khirnov
1f0c7020a1 mjpegdec: add 'extern_huff' private option. 
Deprecate CODEC_FLAG_EXTERN_HUFF
 2011-08-31 13:25:54 +02:00
Anton Khirnov
4623420d84 mpeg4enc: add 'data_partitioning' private option. 
Deprecate CODEC_FLAG_PART
 2011-08-31 13:25:18 +02:00
Anton Khirnov
0cc06b9e23 snow: add 'memc_only' private option. 
Deprecate CODEC_FLAG2_MEMC_ONLY
 2011-08-31 13:24:16 +02:00
Anton Khirnov
0dc5e12f1e libx264: add 'mbtree' private option. 
Deprecate CODEC_FLAG2_MBTREE
 2011-08-31 13:24:02 +02:00
Anton Khirnov
38934f19fe libx264: add 'psy' private option. 
Deprecate CODEC_FLAG2_PSY
 2011-08-31 13:23:37 +02:00
Anton Khirnov
a7cec3a094 libmp3lame: add 'reservoir' private option. 
Deprecate CODEC_FLAG2_BIT_RESERVOIR
 2011-08-31 13:22:53 +02:00
Anton Khirnov
88262ca87d mpeg2enc: add 'non_linear_quant' private option 
Deprecate CODEC_FLAG2_NON_LINEAR_QUANT
 2011-08-31 13:21:59 +02:00
Anton Khirnov
2c5e1efc09 mpeg12enc: add drop_frame_timecode private option. 
Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE
 2011-08-31 13:21:05 +02:00
Anton Khirnov
297d9cb3dc mpeg12enc: add intra_vlc private option. 
Deprecate CODEC_FLAG2_INTRA_VLC.
 2011-08-31 13:19:14 +02:00
Alberto Delmás
d2f119a1f2 VC1: Support dynamic dimension changes 
Fixes SA00072, SA00073, SA10150, SA10151, Issue2076

Improves SA10153

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-31 13:11:23 +02:00
Dustin Brody
a18e04bcf9 mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-31 10:28:29 +02:00
Anton Khirnov
7485e54708 lavc: deprecate CODEC_FLAG2_BRDO 
It's been unused for the last 3 years.
 2011-08-31 10:26:21 +02:00
Anton Khirnov
cf90c5d0e0 libx264: add 'aud' private option. 
Deprecate CODEC_FLAG2_AUD.
 2011-08-31 10:26:11 +02:00
Anton Khirnov
3b82aeeec0 libx264: add 'fast-pskip' private option. 
Deprecate CODEC_FLAG2_FASTPSKIP.
 2011-08-31 10:25:54 +02:00
Anton Khirnov
373257fa79 libx264: add '8x8dct' private option. 
Deprecate CODEC_FLAG2_8X8DCT.
 2011-08-31 10:25:34 +02:00
Anton Khirnov
eab21c32e3 libx264: add 'mixed-refs' private option. 
Deprecate CODEC_FLAG2_MIXED_REFS.
 2011-08-31 10:25:06 +02:00
Anton Khirnov
0f29699db7 libx264: add 'weightb' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:56 +02:00
Anton Khirnov
34dda1251d libx264: add 'b-pyramid' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:17 +02:00
Anton Khirnov
5d4a1048ee libx264: add 'intra-refresh' private option. 
Deprecate CODEC_FLAG2_INTRA_REFRESH.
 2011-08-31 10:23:26 +02:00
Anton Khirnov
faaecd4708 libx264: add 'ssim' private option. 
Deprecate CODEC_FLAG2_SSIM.
 2011-08-31 10:23:03 +02:00
Anton Khirnov
3b81636f33 libx264: make options compatible with x264 
Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd
 2011-08-31 10:21:36 +02:00
Luca Barbato
dde372934a avcodec: remove misleading comment 
coded_width is the width before lowres scaling,
coded_height is the height before lowres scaling.
 2011-08-31 09:57:46 +02:00
Michael Niedermayer
66ce282df5 h264: clean all non null elements of delayed_pic[] 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-31 05:04:14 +02:00
Michael Niedermayer
b955ab2f49 h264: change MAX_DELAYED_PIC_COUNT check to av_assert0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-31 05:00:39 +02:00
Mohamed Naufal
84f26f5288 Support (H/W accelerated) H.264 decoding on Android via Stagefright 2011-08-31 05:12:54 +05:30
Michael Niedermayer
76ba894eab Merge commit 'f593628e5868e52a46de666767896c6afcebdae4' 
* commit 'f593628e5868e52a46de666767896c6afcebdae4':
  avconv: Replace raw picture frame swapping hack.
  RV40: reuse some H.264 motion compensation functions in RV40.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-31 00:12:05 +02:00
Kostya Shishkov
a80852316e RV40: reuse some H.264 motion compensation functions in RV40. 
Since RV40 is based on H.264, it uses the same interpolation filters and
functions for halfpel interpolation in one direction can be reused.
Unfortunately other cases are implemented differently and produce slightly
different output because of rounding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-08-30 12:04:46 +01:00
Carl Eugen Hoyos
66624cbb80 Disable cropping for the brainfart case. 
This fixes ticket #348 for the few users who have a playback application
that supports Sisvel 3D. The other 99% have to wait until FFmpeg
supports arbitrary cropping.
 2011-08-30 10:46:50 +02:00
Michael Niedermayer
6270207511 h264: allow debuging SEI types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 05:41:44 +02:00
Michael Niedermayer
db5effe1a4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Revert "h264: Properly set coded_{width, height} when parsing H.264."
  isom: add missing AVC-Intra tags, rearrange list and update comments
  avconv: remove stubs of crop* and pad* options
  avconv: re-add nb_streams to InputFile.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 22:24:01 +02:00
Luca Barbato
22141917a9 Revert "h264: Properly set coded_{width, height} when parsing H.264." 
This reverts commit b47904d158709bdec1a9d40e83d1abadf50081dc.

coded_{width, height} overwrites width and height in avcodec_open and
it currently just report the non-lowres size.
 2011-08-29 18:32:31 +02:00
Reimar Döffinger
b118255e91 Replace goto by break, it has the same effect. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-27 22:17:23 +02:00
Reimar Döffinger
2cd7a9ebe0 JPEG-LS: clip offset based on cur_scan to valid range. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-27 22:12:50 +02:00
Matthew Einhorn
1d6eca2d27 Removes the internal avcodec_find_best_pix_fmt1()function previously used by avcodec_find_best_pix_fmt() and not used anymore. 
Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-27 05:09:48 +02:00
Michael Niedermayer
1287c81d65 imgconvert: make avcodec_find_best_pix_fmt2() more bug robust against future changes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-27 01:07:00 +02:00
Matthew Einhorn
adfe59407e Adds a new pix fmt function that selects the best dest fmt from among 2 formats to convert to, given a certain src format. 
Similar to avcodec_find_best_pix_fmt(), but instead only compares two destination
pix fmts and selects one of these fmts as the best dest format when converting from
a given source format. Also, as opposed to avcodec_find_best_pix_fmt() which supports
only the first 64 defined pixel formats, this supports as input any of the defined
pixel formats.

Also replaces the old function to rely on the new function.

Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-27 00:57:46 +02:00
Michael Niedermayer
094a496818 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fifo: add FIFO API test program, and fate test
  fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
  postprocess.c: filter name needs to be double 0 terminated
  doxygen: fix wrong comment syntax, //< vs. ///<
  doxygen: drop pointless star from pointer variable names
  Replace deprecated av_find_stream_info() by avformat_find_stream_info().
  xmv: eliminate superfluous zeroing of zero data
  configure: fix typo in avconv dependency list

Conflicts:
	configure
	doc/APIchanges
	libavutil/Makefile
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-26 23:18:54 +02:00
Diego Biurrun
0249478756 doxygen: fix wrong comment syntax, //< vs. ///< 2011-08-26 18:34:28 +02:00
Diego Biurrun
0138a8dead doxygen: drop pointless star from pointer variable names 2011-08-26 18:08:38 +02:00
Michael Niedermayer
a544545a03 acodec: change default bitrate to 128k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-26 14:15:46 +02:00