virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
58,855 Commits 39 Branches 425 Tags
9648c4fe9c24c1afada8e0e37c1317f5e906905a
Commit Graph
58855 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov f7d228676c mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext 2013-12-05 13:22:18 +01:00
Anton Khirnov a097f0049b mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context 2013-12-05 13:22:03 +01:00
Anton Khirnov ff300e435e mpegvideo: remove an unused variable 2013-12-05 13:21:57 +01:00
Anton Khirnov e41ff4210a mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext 2013-12-05 13:19:22 +01:00
Michael Niedermayer 5b4d57455d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Initialize mmxext after amd3dnow optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 11:55:41 +01:00
Michael Niedermayer be99054e77 avcodec/cavsdec: print error messages in case of errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 03:53:39 +01:00
Michael Niedermayer bc1b828536 avcodec/cavsdec: use more specific error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 03:51:08 +01:00
Michael Niedermayer 9ca32b2060 avcodec/cavsdec: print warning if no frame has been decoded 
Fixes ticket3128

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 02:17:15 +01:00
Michael Niedermayer 63f74cedc9 avcodec/cavsdec: reset stc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 02:16:59 +01:00
Michael Niedermayer 0538b29ae8 avcodec/cabac: force get_cabac to be not inlined 
works around bug in gccs inline asm register assignment
Fixes Ticket3177

gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 01:49:35 +01:00
Michael Niedermayer 8dd4f5ecf9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Detect msvcrt libc with a CPP check instead of a link check

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 22:07:37 +01:00
Michael Niedermayer 517ec80859 Merge commit '5ec467328122b80fac94c2d5e3e7540d50381868' 
* commit '5ec467328122b80fac94c2d5e3e7540d50381868':
  configure: Add detected C library and host compiler to informative output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 20:50:23 +01:00
Michael Niedermayer a6af5da7a2 swresample: use the internal buffer for resampling the last few samples 
Fixes out of array read
Fixes Ticket3193

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 20:40:42 +01:00
Diego Biurrun 3d7c84747d x86: Initialize mmxext after amd3dnow optimizations 
The mmxext optimizations should be at least equally fast if available and
amd3dnow optimizations are being deprecated. Thus the former should
override the latter, not the other way around.
 2013-12-04 18:52:48 +01:00
Diego Biurrun bd8b6185f6 configure: Detect msvcrt libc with a CPP check instead of a link check 
Simplifies host/target libc detection splitting.
 2013-12-04 11:50:59 -05:00
Diego Biurrun 5ec4673281 configure: Add detected C library and host compiler to informative output 2013-12-04 09:53:58 -05:00
Michael Niedermayer f3008f30fb avformat/utils: move update_wrap_reference() up 
simplifies code
also remove extra {}

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 14:36:36 +01:00
Michael Niedermayer 34b16e2d36 avformat/utils: reorder operations in update_wrap_reference() 
prevents a integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 14:36:35 +01:00
Michael Niedermayer f1783c05f1 Revert "avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set" 
This reverts commit 758b6d39f6.

Requested-by: smarter
"now that http://git.videolan.org/?p=ffmpeg.git;a=commit;h=97de206b44a48da726807cc3e7b9448a8112760b
 has been merged, http://git.videolan.org/?p=ffmpeg.git;a=commit;h=758b6d39f685a510f48ff9e4c05fffa859d23c42
 could be reverted, this would reduce the delta with libav
 (and it makes sense)"
 2013-12-04 11:46:31 +01:00
Michael Niedermayer c302811643 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: initialize hwaccel_pix_fmt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 04:30:46 +01:00
Rainer HocheckerandMichael Niedermayer f65afef1df mpegts: do not set pts for missing dts in video streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Michael Niedermayer 394b0c830a avformat/utils: correct for timestamp wrap earlier 
This uses dts & pts as reference instead of first_dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Michael Niedermayer d7ead9ad44 avformat/utils: also fix wrapping of start_time in update_initial_timestamps() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Michael Niedermayer dd5f925927 avformat/utils: Fix pts_wrap_behavior calculation with negative first_dts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Stefano Sabatini 704cc5e75d ffprobe: free shared writer context on exit 
Fix leak.

Spotted-by: Michael Niedermayer
 2013-12-03 21:27:14 +01:00
Michael Niedermayer babb611d35 libavcodec/mpegaudio: change CONFIG_FLOAT to USE_FLOAT 
The CONFIG_ name-space is set by configure, so its better to use a
different prefix here.
This also unifies the encoder & decoder define that is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 21:12:00 +01:00
Michael Niedermayer 04e06cdf7d avcodec: split mp2 encoder into float and fixed 
This makes the USE_FLOATS == 0 available to the end user
More float optimizations can easily be added as well now
common code should be factored out into a common file once all
fixed point & floating point optimizations are done, this is to
avoid having to move code back and forth between files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 21:12:00 +01:00
Anton Khirnov c255f0b001 avconv: initialize hwaccel_pix_fmt 
Fixes an assertion failure in vdpau_get_buffer() when -hwaccel auto is
used, but hwaccel init fails.
 2013-12-03 18:11:27 +01:00
Ronald S. BultjeandMichael Niedermayer 9695fb2622 vp9_parser: handle zero-sized packets. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 14:06:34 +01:00
Michael Niedermayer 0e15a344c1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  alsa-audio-dec: explicitly cast the delay to a signed int64

Conflicts:
	libavdevice/alsa-audio-dec.c

no change as the buggy code has been replaced in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 12:20:44 +01:00
Anton Khirnov 089fac77a6 alsa-audio-dec: explicitly cast the delay to a signed int64 
Otherwise the expression will be evaluated as unsigned, which will break
when the result should be negative.
CC:libav-stable@libav.org
 2013-12-03 12:04:26 +01:00
Michael Niedermayer 0cc5011f9a avfilter/vf_pad: fix req_end 
Fixes out of array accesses
Fixes Ticket3190

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 04:09:10 +01:00
Michael Niedermayer 4d0ac9aee9 Makefile: add dependancies for ffversion.h 
It has to be build before the objects that use it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 01:30:04 +01:00
Michael Niedermayer 210a78aeb5 doc/examples/filtering_audio: init packet0.data 
Fixes use of uinitialized data and crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 00:01:07 +01:00
Stefano Sabatini 6ca0ac5e55 doc/ffserver: remove spurious NoAudio option from stream example 2013-12-02 23:52:24 +01:00
Stefano Sabatini d5d51cf04d lavfi/volume: support all channel counts 2013-12-02 23:52:24 +01:00
Michael Niedermayer 830be99ae1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dv: Split off DV video encoder into its own file

Conflicts:
	libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-02 23:04:05 +01:00
Michael Niedermayer b58c1dd632 Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95' 
* commit '21710ea82118c9d19bea9277b2a85a33096fdd95':
  dv: Move DV VLC data tables out of header file

Conflicts:
	libavcodec/dv_vlc_data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-02 20:24:02 +01:00
Michael Niedermayer 6f9be8120d Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276' 
* commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276':
  build: Add rule for building host-specific object files

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-02 20:17:36 +01:00
Michael Niedermayer a6c455cf6b Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11' 
* commit 'ad477710244c761ad1c21246c34e0075fee12d11':
  build: Add shorthand for HOSTCC compile macro

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-02 20:08:01 +01:00
Stefano Sabatini c490cd4c1a doc/examples/filtering_audio: fix chunked audio decoding 
Support the case when multiple frames are contained in a single packet.
In particular, fix fate-samples/lossless-audio/luckynight-partial.shn
sample decoding.
 2013-12-02 15:21:52 +01:00
Stefano Sabatini 893f33e7f0 doc/examples/filtering_audio: fix style 2013-12-02 15:08:00 +01:00
Stefano Sabatini c7a99d99bd doc/examples/filtering_video: do not make use of AVBufferSinkParams 
Set the value on the filter context instead. Simplify.
 2013-12-02 14:35:40 +01:00
Stefano Sabatini 3aa6018010 doc/examples/filtering_video: add some error handling in init_filters() 2013-12-02 14:35:39 +01:00
Stefano Sabatini a12bf9f50f doc/examples/README: fix typo 2013-12-02 14:35:39 +01:00
Stefano Sabatini 55c57658d2 doc/examples/filtering_audio: add more error checks 2013-12-02 14:35:39 +01:00
Stefano Sabatini 82e74ee6e4 doc/examples/filtering: make use of av_err2str() 
Simplify.
 2013-12-02 14:35:31 +01:00
Diego Biurrun 97d19c2fec dv: Split off DV video encoder into its own file 2013-12-02 13:13:09 +01:00
Diego Biurrun 21710ea821 dv: Move DV VLC data tables out of header file 2013-12-02 13:13:09 +01:00
Diego Biurrun 5a9fcc7d25 build: Add rule for building host-specific object files 2013-12-02 13:13:09 +01:00