videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
60,179 Commits 36 Branches 392 Tags 200 MiB
Commit Graph

60179 Commits

Author SHA1 Message Date
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
Michael Niedermayer 7b89e24151 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bfin: vp3: Mark all binary object sections appropriately

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 16:08:24 +01:00
Michael Niedermayer 0e59e30b14 Merge commit 'ea49f60523c4f4c43cb06a35166b44478d473e51' 
* commit 'ea49f60523c4f4c43cb06a35166b44478d473e51':
  h264: skip chroma edges at the picture boundary while deblocking 4:4:4

Conflicts:
	libavcodec/h264.c

See: f27b22b497
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 16:02:12 +01:00
Michael Niedermayer 383d2339e0 Merge commit '8267f9363532b23b3b8b4e27491ee2d412a8aec3' 
* commit '8267f9363532b23b3b8b4e27491ee2d412a8aec3':
  configure: Set default HOSTCFLAGS/HOSTCPPFLAGS after compiler detection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 15:31:52 +01:00
addr-see-the-website@aetey.se 762c4dc082 avcodec/cinepakenc: fixes and improvements 
Fixed/improved multistrip adaptivity.
Improved R/D by optimized codebook generation.
Support for the correct color space.
Vintage compatibility.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 15:23:53 +01:00
Tomas Härdin 59dbc36f49 Adding Cinepak encoder 
With permission of Tomas Härdin applied by Rl aetey.se

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 14:41:24 +01:00
Diego Biurrun 19987fa18c bfin: vp3: Mark all binary object sections appropriately 
This fixes a leftover from e44d7c659b.
 2014-01-22 05:38:15 -08:00
Janne Grunau ea49f60523 h264: skip chroma edges at the picture boundary while deblocking 4:4:4 
This handles macroblock edges for the chroma components in the same way
as for the luma compoment for 4:4:4 streams. The Spec explicitly states
that the deblocking filter is not applied to edges at the boundary of
the picture.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2014-01-22 13:44:28 +01:00
Diego Biurrun 8267f93635 configure: Set default HOSTCFLAGS/HOSTCPPFLAGS after compiler detection 
This prevents the default HOSTCFLAGS from getting clobbered by flags
passed to configure on the command line.
 2014-01-22 10:33:04 +01:00
Michael Niedermayer 94a52417cb Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavf/ftp: remove double space
  lavf/libssh: fix seek with whence==SEEK_CUR
  lavf/libssh: rename context variable from s into libssh
  lavf/libssh: add av_cold attributes
  lavf/libssh: factorize create_sftp_session function
  lavf/libssh: factorize create_ssh_session function
  lavf/libssh: factorize file_stat function
  lavf/libssh: factorize open_file function
  lavf/libssh: add private_key option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-22 01:12:23 +01:00
Lukasz Marek 9ef441c525 lavf/ftp: remove double space 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Lukasz Marek e0d124a920 lavf/libssh: fix seek with whence==SEEK_CUR 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Lukasz Marek b271aac536 lavf/libssh: rename context variable from s into libssh 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Lukasz Marek 522814455c lavf/libssh: add av_cold attributes 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Lukasz Marek 7fb5f55e1e lavf/libssh: factorize create_sftp_session function 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Lukasz Marek 77fadab1be lavf/libssh: factorize create_ssh_session function 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Lukasz Marek bf5d73b04d lavf/libssh: factorize file_stat function 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Lukasz Marek 8d3f14e11b lavf/libssh: factorize open_file function 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00