virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
58,782 Commits 37 Branches 400 Tags 464 MiB
08667c2678
Commit Graph

58782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
08667c2678 Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4' 
* commit '0b0a7a751de02464a33717e70352f696372ba1c4':
  mpegvideo: move encode-only parts of common_end() to encode_end()

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 03:12:10 +01:00
Michael Niedermayer
e3b7f0e184 Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d' 
* commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d':
  mpegvideo: remove commented out cruft from ff_MPV_frame_end()

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 02:54:45 +01:00
Michael Niedermayer
b6e7834ac6 avcodec/mpegvideo_enc: fix linesizes in frame_end() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 02:53:10 +01:00
Michael Niedermayer
26c2e3bf1a Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a' 
* commit '381a722562bcc0b623acf6a00a583fe989bcb72a':
  mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 02:48:09 +01:00
Michael Niedermayer
d5050bae80 Merge commit 'b7254288d222013e20539c530b1ec5d324ed5352' 
* commit 'b7254288d222013e20539c530b1ec5d324ed5352':
  mpegvideo: do not update last_non_b_pict_type in update_thread_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 02:18:50 +01:00
Michael Niedermayer
20b28fc7b0 Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06' 
* commit '1f8eb69079880ef1f394c498dfdf471f91222a06':
  mpegvideo: move encoding-only initialization from common_init() to encode_init()

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 02:12:59 +01:00
Michael Niedermayer
2951b7fb1d Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0' 
* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0':
  mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 01:58:55 +01:00
Michael Niedermayer
16338b4fb9 Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a' 
* commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a':
  mpegvideo: don't copy input_picture_number in update_thread_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 01:52:53 +01:00
Michael Niedermayer
cf948200bd Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55' 
* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55':
  mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 01:46:51 +01:00
Michael Niedermayer
36e2ec4068 Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24' 
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24':
  mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 01:38:55 +01:00
Michael Niedermayer
db7580b4f6 Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f' 
* commit 'a097f0049b28dc3ed13625e4a42619292c92492f':
  mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 01:33:17 +01:00
Michael Niedermayer
85d3bc33b1 Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e' 
* commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e':
  mpegvideo: remove an unused variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 01:21:39 +01:00
Michael Niedermayer
92e10e34b1 Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2' 
* commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2':
  mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 01:14:46 +01:00
James Almer
56572787ae Add Windows resource file support for shared libraries 
Originally written by James Almer <jamrial@gmail.com>

With the following contributions by Timothy Gu <timothygu99@gmail.com>

* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
  file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.

[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 23:42:07 +01:00
Carl Eugen Hoyos
af7562a035 Ignore es_map_length when parsing mpeg program stream map. 
Fixes ticket #3195.
 2013-12-05 21:17:21 +01:00
Michael Niedermayer
e2bf00ce46 avformat/mov: calculate rfps from the first 100 frames of the index 
This reduces the amount of frames that need to be demuxed in av_find_stream_info()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 17:46:40 +01:00
Michael Niedermayer
1565a9a9e9 avformat/utils: factor rfps calculation out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 17:30:13 +01:00
Michael Niedermayer
dc1b0a54f9 avformat/utils: provide more IO statistics in debug output at start and end of av_find_streaminfo() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 16:09:11 +01:00
Michael Niedermayer
6005ab3e0e avcodec/mjpegenc: use av_log2_16bit() in encode_block() 
This reduces the number of operations done per non zero coefficient

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 14:15:28 +01:00
Anton Khirnov
0b0a7a751d mpegvideo: move encode-only parts of common_end() to encode_end() 2013-12-05 13:25:26 +01:00
Anton Khirnov
d0d111d059 mpegvideo: remove commented out cruft from ff_MPV_frame_end() 2013-12-05 13:25:15 +01:00
Anton Khirnov
381a722562 mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function 2013-12-05 13:23:55 +01:00
Anton Khirnov
b7254288d2 mpegvideo: do not update last_non_b_pict_type in update_thread_context() 
It is used for encoding only.
 2013-12-05 13:23:33 +01:00
Anton Khirnov
1f8eb69079 mpegvideo: move encoding-only initialization from common_init() to encode_init() 2013-12-05 13:23:03 +01:00
Anton Khirnov
bedf952bb8 mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults() 2013-12-05 13:22:55 +01:00
Anton Khirnov
2cab011f0f mpegvideo: don't copy input_picture_number in update_thread_context() 
It is encoding-only, frame threading is not used for encoding.
 2013-12-05 13:22:46 +01:00
Anton Khirnov
ff7ffe4809 mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext 2013-12-05 13:22:37 +01:00
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 Hochecker
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