virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
40,933 Commits 37 Branches 400 Tags 470 MiB
a6f650af8d
Commit Graph

40933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a6f650af8d aac: fix SCE in stereo case, this is surprisingly actually needed 
Fixes Ticket513

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:43:00 +02:00
Michael Niedermayer
a3710f1ebb aacdec: print debug note when unexpected SCE/CPE is encountered 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:34:32 +02:00
Michael Niedermayer
3230590c5d libavcodec: fix side data split with 0 sized packets 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:34:32 +02:00
Michael Niedermayer
a1bb0823a9 libavcodec: correct consumed bytes for decoders 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:34:32 +02:00
Michael Niedermayer
307562be98 mpeg4videodec: print more debug info for debug_pict_info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 14:56:12 +02:00
Michael Niedermayer
8258697c49 ivi_common: skip null frames for all indeo variants 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 14:56:12 +02:00
Stefano Sabatini
6374ee72df ffprobe: remove ad-hoc behavior when nb_fmt_entries_to_show is 1 
The special-case behavior may complicate parsing when the
-show_format_entry option is used programmatically in a script.

The option default=nk=1 achieves the same purpose, if the objective is to
skip printing the single field key.
 2012-05-21 10:32:25 +02:00
Stefano Sabatini
3853e1d94e doc/ffprobe: document that ffprobe.xsd can be retrieved at a certain ffmpeg.org url 
Address trac ticket #1265.
 2012-05-21 10:32:08 +02:00
Michael Niedermayer
349c62410b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
  indeo: Drop unused debug function ivi_check_band().
  avcodec/utils: cast a function argument to shut up a compiler warning
  truemotion1: remove disabled code
  fix typo in comment
  fate: fix dependencies for non-SAMPLES avconv tests
  indeo: check for invalid motion vectors
  indeo: check that band output buffer exists
  indeo: clear allocated band buffers
  indeo: track tile macroblock size
  indeo: check custom Huffman tables for errors
  factor out common decoding code for Indeo 4 and Indeo 5
  mp3: fix start band index for block type 2 in 8kHz audio
  lavf: change some (de)muxer names to lowercase
  lavf: make output format matching case insensitive

Conflicts:
	libavcodec/indeo4.c
	libavcodec/indeo5.c
	libavcodec/ivi_common.c
	libavcodec/utils.c
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 22:58:04 +02:00
Matthieu Bouron
432fe9a38a ffmpeg: fix a crash with complex filters when pix_fmt is not specified 
ffmpeg -i in.mxf -filter_complex "[0:0]fieldorder=tff" out.wav will
fail with an error message instead of crashing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 19:36:00 +02:00
Michael Niedermayer
318e395764 ffmpeg: drop get_sync_ipts() and drop related special case for video 
Idea found in a commit from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 19:36:00 +02:00
Marton Balint
b36a0a80fc lavf: also use codec aspect ratio in av_guess_sample_aspect_ratio 
Use codec aspect ratio for frame aspect ratio if AVFrame is NULL.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 19:36:00 +02:00
Nicolas George
4a5d18b6e2 vsrc_mandelbrot: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
dc6a02de01 vsrc_life: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
ca554fbc2f vsrc_cellauto: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
2987efe9ba vf_ass: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
5732f40e3f x11grab: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
3e63071115 v4l2: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
0ef4924db4 sdl: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
9bcd70aa23 bktr: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
16a44b41ab vsrc_testsrc: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
2ec3e5767e opt: add AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Jean First
f7985f348f exr: fix header parsing 
the header in the sample provided for ticket #1306 is not parsed correctly and thus
ffmpeg tries to decode the sample instead of abording the decoding.

I tested it with two other exr samples I have - one float, one half float - and
they still decode correctly.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:39:08 +02:00
Michael Niedermayer
9225513242 vf_scale: support dynamically changing input parameters. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:39:03 +02:00
Michael Niedermayer
4b5ff9b63e ffplay: Use input picture parameters in input_request_frame(). 
Fixes Ticket122

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:29:08 +02:00
Piotr Bandurski
4d18f4c15b id3v2: reject APICs with size of 0 
fixes ticket #1324

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:29:08 +02:00
Piotr Bandurski
cb7b0f3573 flicvideo: support 256-bytes extradata 
sample:

http://www.datafilehost.com/download-ab1156a9.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:29:08 +02:00
Piotr Bandurski
718b90d4b9 aasc: support 16bpp 
sample:

http://www.datafilehost.com/download-b881f3f6.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:29:07 +02:00
Michael Niedermayer
cf9812d22b ffmpeg: move setting big_picture.pts up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:29:07 +02:00
Stefano Sabatini
cd945d2112 lavu/tree: perform minor fixes to av_tree_insert() documentation 2012-05-20 16:19:36 +02:00
Diego Biurrun
4f04f5cc8b indeo: Make ivi_calc_band_checksum() static, it is only used in one file. 2012-05-20 15:59:30 +02:00
Diego Biurrun
9ccbdc0aca indeo: Drop unused debug function ivi_check_band(). 2012-05-20 15:56:25 +02:00
Nicolas George
6adefeef45 buffersrc: cosmetic: reindent. 2012-05-20 15:41:58 +02:00
Diego Biurrun
0c517644b2 avcodec/utils: cast a function argument to shut up a compiler warning 
libavcodec/utils.c:251: note: expected ‘const uint8_t *’ but argument is of type ‘const short int *’
 2012-05-20 15:09:07 +02:00
Diego Biurrun
4466d0e84b truemotion1: remove disabled code 2012-05-20 15:04:43 +02:00
Kostya Shishkov
f05b69a79f fix typo in comment 2012-05-20 14:15:14 +02:00
Mans Rullgard
4852cb37ce fate: fix dependencies for non-SAMPLES avconv tests 
The encode/decode tests should all depend on avconv.  Since
avconv requires libavfilter, there is no need to enable those
tests selectively.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-20 12:54:31 +01:00
Nicolas George
ea07063fd8 cmdutils: allow to specify a stream by its ID. 
The stream can be specified as "#129" or "#0x81".
It is especially useful for VOBs dumped from a DVD,
where the language-id mapping is available externally
and the probing can find the streams in a random order.
 2012-05-20 12:47:27 +02:00
Michael Niedermayer
bf3dce6b59 ffmpeg: change AVFMT_RAWPICTURE pts to reduce diff to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 12:29:33 +02:00
Michael Niedermayer
13c254a216 ffmpeg: random cosmectics to reduce diff to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 12:24:49 +02:00
Michael Niedermayer
9ce3d03fc2 ffmpeg: cosmetics to reduce difference to qatar by 101 lines 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 12:12:13 +02:00
Michael Niedermayer
3ba90d9e97 ffmpeg: cosmetics to reduce difference to qatar by about 90 lines 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 12:12:13 +02:00
Michael Niedermayer
c53326afad ffmpeg: move ost->frame_rate setting code before the filtergraph stuff 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 11:55:25 +02:00
Michael Niedermayer
953df5d962 ffmpeg: drop pkt_pts 
Reduces diff to qatar by 9 lines
Should not change anything

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 11:40:05 +02:00
Michael Niedermayer
ef7ac8e8ec ffmpeg: set the video filters timebase to the demuxers. 
Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 11:40:05 +02:00
Michael Niedermayer
3cf5591344 ffmpeg: reintroducing check_recording_time() 
This reduces the difference to qatar by 27 lines
No functional change, the code should be unused

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 11:35:08 +02:00
Michael Niedermayer
8364cb9719 ffmpeg: fix uninitialized variable warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 11:35:08 +02:00
Kostya Shishkov
cf61aaaca1 indeo: check for invalid motion vectors 2012-05-20 11:19:48 +02:00
Kostya Shishkov
9603738221 indeo: check that band output buffer exists 2012-05-20 11:19:48 +02:00
Kostya Shishkov
23ba1503f2 indeo: clear allocated band buffers 2012-05-20 11:19:48 +02:00