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

60146 Commits

Author SHA1 Message Date
James Darnley c14b011a97 lavf/flacenc: fix comment after previous change 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 22:41:06 +01:00
James Darnley 72eeb18468 lavf/flacenc: use metadata_header_padding 
Allows a user to control the amount, if any, of padding they want added
to the file.  If set to zero the block will not be written at all.  If
set to some positive number four more bytes will be added to the file
due to the small header required for the block.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 22:40:23 +01:00
James Darnley 86bee7984e AVFormatContext: add metadata_header_padding field 
This field is used to store the number of bytes that should be written
as padding to a metadata header of a file.  For example:
 - The FLAC format's METADATA_BLOCK_PADDING [1]
 - The ID3v2 tag format's padding           [2]

[1] http://xiph.org/flac/format.html#metadata_block_padding
[2] http://id3.org/id3v2.3.0#ID3v2_overview

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 22:33:21 +01:00
Serhii Marchuk 1d07385053 mpegts demuxer: store PMT values of DVB teletext to extradata 
* Using extradata by TS demuxer to store values from PMT
* Support of multiple languages in one DVB teletext stream:
  comma separated language codes in metadata "language" field

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 22:14:01 +01:00
Serhii Marchuk 2ebee19e1e mpegts muxer: restore PMT table of DVB teletext from extradata 
* Using extradata by TS muxer to correctly restore PMT table
* PES_header_data_length should be always 0x24 for DVB teletext,
  according to DVB standard

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 22:07:40 +01:00
Serhii Marchuk f8051bd31a mpegts muxer: Change the default subtitle language to "und" 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 22:01:37 +01:00
João Bernardo 290326711b avutil/opt: Better print representation of number limits 
Signed-off-by: João Bernardo Oliveira <jbvsmo@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 21:14:02 +01:00
Michael Niedermayer 934bb11ad7 avcodec/mpeg12dec: fix mis-indented line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 18:09:17 +01:00
Michael Niedermayer 5f54756f7e avcodec/mpeg12dec: Disable the checked bitstream reader 
Mpeg1/2 should not need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 18:09:17 +01:00
Michael Niedermayer 76b5e99ce9 avcodec/mpeg12dec: Check for overread in mpeg_decode_slice() 
This is needed in case the checked bitstream reader is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 18:09:17 +01:00
Michael Niedermayer d82eccea2b avcodec/mpeg12dec: check block index in mpeg2_fast_decode_block_non_intra() 
Prevents some overreads at the cost of 1 cpu cycle

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 18:09:16 +01:00
Michael Niedermayer 0c8e5fb211 avcodec/mpeg12dec: Optimize mpeg1_decode_block_intra() 
sandybridge i7 274->260 cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 18:09:16 +01:00
Michael Niedermayer 0a59055167 avcodec/mpeg12dec: check for overread in mpeg1_fast_decode_block_inter() 
No speedloss meassured

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 18:09:16 +01:00
Michael Niedermayer 746350ea0f avcodec/mpeg12dec: Make mpeg2_fast_decode_block_intra() more robust by breaking out on invalid vlcs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 18:09:16 +01:00
Michael Niedermayer a0e9dfb5ae Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vp9: fix bugs in updating coef probabilities with parallelmode=1

Conflicts:
	libavcodec/vp9.c

No change, the bug/buggy code doesnt seem to be in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 12:47:31 +01:00
Michael Niedermayer 3672458573 Merge commit 'bd01412313c728400f1fc5448ede0ad8b51da0d1' 
* commit 'bd01412313c728400f1fc5448ede0ad8b51da0d1':
  vp9: fix mvref finding to adhere to bug in libvpx.

Conflicts:
	libavcodec/vp9mvs.c

No change
See: dd3d0f46bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 12:37:12 +01:00
Stefano Sabatini ca57659440 examples/filtering_audio,video: do not call avcodec_register_all() 
It is implied by av_register_all(). Simplify.
 2014-01-24 12:20:46 +01:00
Stefano Sabatini 433b153b68 doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options 
Avoid doc duplication and desynching.
 2014-01-24 12:20:46 +01:00
Guillaume Martres 50866c8d95 vp9: fix bugs in updating coef probabilities with parallelmode=1 
- The memcpy was completely wrong because
s->prob_ctx[s->framectxid].coef is a [4][2][2][6][6][3] array, whereas
s->prob.coef is a [4][2][2][6][6][11] array.
- The additional check was committed to ffmpeg by Ronald S. Bultje.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-01-24 07:03:11 +01:00
Ronald S. Bultje bd01412313 vp9: fix mvref finding to adhere to bug in libvpx. 
Fixes a particular youtube video that I unfortunately can't share.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-01-24 07:02:56 +01:00
Michael Niedermayer 4b8c599e84 avformat/nutenc: fix missing break in switch 
Fixes CID1163848
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 04:17:15 +01:00
Michael Niedermayer 41003da94a avfilter/avfilter: fix use of uninitialized pointer 
Fixes CID1163852
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 04:14:52 +01:00
Michael Niedermayer 40c218c60d avcodec/vc1: fix type of tmp 
Fixes CID1163850
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 03:40:37 +01:00
Michael Niedermayer 9b68538fdd avcodec/libopenjpegenc: Replace av_frame_alloc() and av_frame_ref() by av_frame_clone() 
Simplifies code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 03:25:47 +01:00
Michael Niedermayer a26e9c1040 avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref() 
This avoids the need for double error checking
Fixes CID1163843

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 03:24:55 +01:00
Michael Niedermayer 52d2bcc786 avcodec/libopenjpegenc: Check the return code of av_frame_ref() 
Fixes CID1163842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 02:58:20 +01:00
Michael Niedermayer 7853024071 avcodec/h264_cabac: Fix use with the checked bitstream-reader 
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 00:05:17 +01:00
Reynaldo H. Verdejo Pinochet 4d888a0ad8 libavformat/mtv: add missing MTV_ prefix to macro 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-01-23 17:40:58 -03:00
Reynaldo H. Verdejo Pinochet ba15aab4a4 libavformat/mtv: make clear we assume bpp is always 16 
All samples in the wild are RGB565/555 and we are already
acting on this assumption when pushing out the video frames,
so if we get anything != than 16 for bpp we just override
this value for doing any calculations making our approach
consistent.

Also avoid repeatedly shifting bpp.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-01-23 17:40:58 -03:00
Reynaldo H. Verdejo Pinochet d467e7df1a libavformat/mtv: donwgrade probe score for < 512 
MTV has a 512 bytes header. We should be able to
parse required fiels from the first 57 (rest is
padding) but if we haven't seen enough data then
go with SCORE_EXTENSION.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-01-23 17:40:58 -03:00
Reynaldo H. Verdejo Pinochet 30f4c58f6f libavformat/mtv: Check for min header size first 
Abort immediately if we are not getting enough
data to extract the required fields.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-01-23 17:40:58 -03:00
addr-see-the-website@aetey.se bf23642dcc Cinepak encoder: adding option handling for flexibility 
Now it is possible to adjust compression speed vs R/D when needed
and also skip vintage players compatibility at will.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 20:27:06 +01:00
Michael Niedermayer c1333a762c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec_asf: Copy the need_parsing field from the chained demuxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 20:15:21 +01:00
Martin Storsjö 2aec9e228c rtpdec_asf: Copy the need_parsing field from the chained demuxer 
This fixes playback of mp3 streams in rtp/asf. This used to work
until c6f1dc8, but mostly by coincidence.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-01-23 17:37:10 +02:00
Stefano Sabatini 094516a5d0 ffmpeg: use av_err2str() macro 
Simplify.
 2014-01-23 16:29:44 +01:00
Stefano Sabatini 9f956d9d8d ffmpeg: apply misc cosmetics to process_input() code 2014-01-23 16:29:39 +01:00
Michael Niedermayer 8456bd2c0f avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like its part of quicktime stsd 
This is needed for matroska spec compliance
Fixes playback of SVQ3 in matroska with vlc
Fixes Ticket 3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 14:49:50 +01:00
Eli Kara da25a6573f avformat/http: Properly handle cookies that specify sub-domain where the URL. 
Fixes ticket #3336

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 14:39:36 +01:00
Matt Oliver 306e1ac012 avformat/tls: Fix windows build with openSSL enabled. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 14:33:56 +01:00
Michael Niedermayer e6d1c66d74 avcodec/x86/lossless_videodsp: disable median optimizations for 16bps 
They only support upto 15bps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 01:51:24 +01:00
Michael Niedermayer eaacfc7dd1 avcodec/lossless_videodsp: Pass AVCodecContext to init 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 01:43:00 +01:00
Michael Niedermayer 622d463000 avcodec/bitstream: assert that no integer overflow happened when writing codes in build_table() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-23 01:43:00 +01:00
Stefano Sabatini 35fe88bb51 examples/muxing: reindent after previous commit 2014-01-23 01:08:24 +01:00
Stefano Sabatini c92d2f98db examples/muxing: flush encoders at the end 2014-01-23 00:54:33 +01:00
Michael Niedermayer 0269b30fef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo_enc: Don't call ff_h263dsp_init unconditionally

Conflicts:
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 23:36:33 +01:00
Michael Niedermayer ef00ef7553 avcodec/x86/lossless_videodsp: port sub_hfyu_median_prediction_int16 to yasm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 23:27:27 +01:00
Michael Niedermayer fad49aae28 avcodec/x86/lossless_videodsp: Port sub_hfyu_median_prediction_mmxext to int16 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 22:55:49 +01:00
Michael Niedermayer fee97f25fa avcodec/x86/lossless_videodsp: port add_hfyu_median_prediction_mmxext to 16bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 21:11:40 +01:00
Michael Niedermayer 631939bde6 avcodec/x86/lossless_videodsp: add diff_int16_mmx/sse2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 19:41:21 +01:00
Martin Storsjö cff480e49d mpegvideo_enc: Don't call ff_h263dsp_init unconditionally 
This fixes builds with e.g. --disable-decoders --disable-encoders
--enable-encoder=mjpeg.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-01-22 18:42:38 +02:00