virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity
64,669 Commits 38 Branches 406 Tags
1241eb88704f75fe9e7d1de3663aa24d4318cdab
Commit Graph

64669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
9098f0ecd7 ffmpeg: remove common factors from copied timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:51:31 +02:00
Michael Niedermayer
8e7c8325d2 Merge commit '3f3232a371cc88696184d9aef1f812656264e56c' 
* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:44:25 +02:00
Michael Niedermayer
4b13ec69c6 Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f' 
* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
  avformat: update muxing doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:38:27 +02:00
Michael Niedermayer
714d9bd6ee Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9' 
* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
  cdg: set the keyframe flag on the first packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:30:45 +02:00
Michael Niedermayer
76a35f7830 avcodec/roqvideoenc: Print the correct max resolution 
Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:20:31 +02:00
Michael Niedermayer
9af59db6ec avcodec/roqvideoenc: More verbose warning about no power of 2 dimensions 
Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:19:55 +02:00
Oliver Fromme
a32dcaaaf8 avcodec/dvdsubenc: Add dvdsub workaround for some players 
The issue affects dvdsub subtitles (a.k.a. VOBSUB).

Some players -- in particular hardware players -- cut off
the lowest row of pixels if the number of rows in the subtitle
is odd.

The patch below implements a work-around for that.  If the
number of rows is odd, it is simply rounded up to an even
number, adding an invisible (i.e. fully transparent) row.
The work-around can be enabled or disabled with a new
option -even_rows_fix.  The default is disabled, so there
is no change of behaviour for users who don't care about it.

The overhead for the fix is low, and in many cases even zero:
For subtitles with an odd number of rows (i.e. in 50% of
cases on average), the size increases by two bytes because
a fully transparent row is encoded as 0x00 0x00.  However,
in the VOBSUB standard, all data packets are padded to 2KB
anyway, so in most cases the additional bytes just use some
part of the padding, so there is no overhead.  Only in the
rare case that the 2KB boundary is hit (0.1% chance), a full
2KB block is added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 20:11:36 +02:00
Michael Niedermayer
e36916a63f avcodec/pthread_frame: fix setting hwaccel with threads and get_format() 
Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

Tested-by: oromit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 19:58:58 +02:00
Michael Niedermayer
31d49db75e avutil/bprint:ædd io.h, try to fix msvc build 
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 18:16:45 +02:00
Diego Biurrun
f46bb608d9 dsputil: Split off pixel block routines into their own context 2014-07-09 08:05:26 -07:00
Michael Niedermayer
b83e0903ec avformat/m4vdec: raise threshold slightly for detection 
Fixes Ticket3746

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 17:02:34 +02:00
Vittorio Giovara
0569a7e0bd hevc: parse display orientation SEI message 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-09 10:18:06 -04:00
Vittorio Giovara
18e3d61e9e h264: parse display orientation SEI message 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-09 10:17:42 -04:00
Vittorio Giovara
a54f03bf07 display: add matrix flip api 2014-07-09 10:14:12 -04:00
Michael Niedermayer
f32c5d1a8d avcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 16:04:32 +02:00
Andrew Kelley
33a7b453a8 doc: mention option to mix shared/static libraries 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-09 09:57:10 -04:00
Anton Khirnov
0307cc2253 rtpdec: pass an AVFormatContext to ff_parse_fmtp() 
Use it for logging, instead of NULL or the stream codec context.
 2014-07-09 13:40:54 +00:00
Anton Khirnov
650d384048 yuv4mpegenc: do not access AVCodecContext.coded_frame 
Its contents are meaningful only if the stream codec context is the one
actually used for encoding, which is often not the case (and is
discouraged).

Use AVCodecContext.field_order instead.
 2014-07-09 13:40:39 +00:00
Anton Khirnov
27c1f82f56 nsvdec: remove commented out cruft 2014-07-09 13:38:54 +00:00
Anton Khirnov
edb1af7c46 mov: free the dv demux context with avformat_free_context() 2014-07-09 13:38:35 +00:00
Anton Khirnov
a14b61658c mtv: do not set sample_rate for video 2014-07-09 13:38:26 +00:00
Anton Khirnov
b8604a9761 oggparsecelt: do not set AVCodecContext.frame_size 
It is supposed to be set by decoders only.
 2014-07-09 13:38:14 +00:00
Anton Khirnov
d5cf5afabb adxdec: get rid of an avpriv function 
The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.
 2014-07-09 13:37:18 +00:00
Anton Khirnov
f6ee61fb05 lavc: export DV profile API used by muxer/demuxer as public 2014-07-09 13:35:07 +00:00
Anton Khirnov
3f3232a371 avconv: set the output stream timebase 
This is required by the new API.
 2014-07-09 13:30:33 +00:00
Anton Khirnov
c9c1265c52 avformat: update muxing doxy 
The callers should now set the stream timebase, not the codec one.
 2014-07-09 13:30:22 +00:00
Anton Khirnov
abda15a990 cdg: set the keyframe flag on the first packet 
Bug-Id: 55
 2014-07-09 13:30:11 +00:00
Carl Eugen Hoyos
d6e7881c2e Fix wmv1 encoding if all other msmpeg4-related encoders were disabled. 2014-07-09 08:51:17 +02:00
Carl Eugen Hoyos
e4dfc3f9b8 Fix wmv1 decoding if no other msmpeg4-related decoder was compiled. 2014-07-09 08:27:24 +02:00
Michael Niedermayer
c8b2cf4996 avcodec/mpegvideo: flip motion vector visualization for backward motion vectors 
Also support changing arrow head/tail shape

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 03:07:25 +02:00
Michael Niedermayer
98eab98159 avdevice/pulse_audio_dec: reimplement using the non simple API 
This fixes timestamps

Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 01:36:01 +02:00
Mark Boorer
352756ecae avformat/movenc: respect color_range when encoding dnxhd. 
Set the ACLR atom appropriately for legal / full range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 00:35:23 +02:00
Michael Niedermayer
7125b6ca90 avformat/segment: remove gettimeofday() use, remove sys/time.h 
It causes portability issues, and would need ifdef hell if its kept

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 22:52:39 +02:00
James Almer
2375b09473 alpha/idctdsp: move idct init code out of dsputil 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 22:19:38 +02:00
Alexander V. Lukyanov
8635954335 avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721) 
AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

This fixes memory corruption from bug #3721 (RTSPState is smaller than
MpegTSContext thus innocent memory gets overwritten).

Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 22:06:18 +02:00
Michael Niedermayer
fd3388d63d Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294' 
* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 21:53:09 +02:00
Michael Niedermayer
839688bc63 Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d' 
* commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfbda
See: 99b01e458c
See: 825ec16da9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 21:52:06 +02:00
Michael Niedermayer
a26ecba075 Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917' 
* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
	libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 21:18:36 +02:00
Michael Niedermayer
eee6ad38f9 avdevice/lavfi: add io.h, should fix msvc build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 20:29:59 +02:00
Michael Niedermayer
550bda741c avcodec/alpha/dsputil_alpha: fix build 
Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 20:15:31 +02:00
Martin Storsjö
18fb38fb9e mov: Remove a variable that is set but never used 
This silences a warning with gcc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-08 21:14:43 +03:00
Martin Storsjö
cf280ed004 avplay: Handle pixel aspect ratio properly 
This was broken (left half-implemented) in 354468fc12.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-08 21:14:43 +03:00
Luca Barbato
52a1c32c0a nut: Use nut->version in the version range check 
It was wrongly left unchanged when the version field had been
introduced. (c94e2e85cb)
 2014-07-08 19:04:09 +02:00
Michael Niedermayer
7cb8f7ded4 avcodec/proresenc_anatoliy: check against maximum dimensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 18:03:11 +02:00
Michael Niedermayer
7c7441b37d avcodec/roqvideoenc: check dimensions against maximum 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 17:33:39 +02:00
Michael Niedermayer
fe4c76b3d0 avcodec/roqvideoenc: fix infinite lambda increasing loop 
The threshold was choosen so that no further size decrease happened with larger lambda
with the test video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 17:09:56 +02:00
Michael Niedermayer
a981d1b6aa avformat/nutdec: if all else fails try to lookup video tag in isom 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 16:37:06 +02:00
Michael Niedermayer
5a4edf6f0d avformat/movenc: check that the video resolution is supported 
Resolutions are stored as 16bit integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 16:17:44 +02:00
Michael Niedermayer
1f935c3d0b Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6' 
* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 14:44:12 +02:00
Michael Niedermayer
70b423e148 Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe' 
* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe':
  avformat_new_stream: make the AVCodec parameter const

Conflicts:
	libavformat/utils.c

See: e12cfd044c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 14:29:47 +02:00