virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
63,022 Commits 37 Branches 400 Tags 463 MiB
1898c2f49d
Commit Graph

63022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
ef9732162c rmdec: do not export anything to AVCodecContext.codec_name 
That field will be deprecated and the value that is written there is not
particularly useful.
 2014-05-01 09:26:51 +02:00
Anton Khirnov
6072184e70 asfenc: use codec descriptors instead of AVCodecs to write codec info 
Also, stop using AVCodecContext.codec_name as fallback, since it will be
deprecated.

Changes the result of the lavf-asf test (and its associated seektest),
since 'msmpeg4v3' gets written instead of just 'msmpeg4'.
 2014-05-01 09:26:20 +02:00
Anton Khirnov
92e4b643df oggparseskeleton: do not use AVCodecContext.codec_name 
That field is undocumented, of dubious use, and will be deprecated.
 2014-05-01 09:26:02 +02:00
Anton Khirnov
18f2514c40 mov: export stsd Compressorname in metadata 
Stop using the undocumented to-be-deprecated AVCodecContext.codec_name
field.
 2014-05-01 09:25:46 +02:00
Anton Khirnov
a2941c8cb2 lavc: move CODEC_FLAG_MV0 to mpegvideo 2014-05-01 09:24:18 +02:00
Anton Khirnov
6484149158 lavc: make the xvid-specific "gmc" flag a private option of libxvid 2014-05-01 09:24:02 +02:00
Anton Khirnov
b2c31710c9 lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo 2014-05-01 09:23:19 +02:00
Anton Khirnov
5fccedaa67 lavc: deprecate CODEC_FLAG_INPUT_PRESERVED 
The addition of reference-counted frames makes it pointless.
 2014-05-01 09:22:47 +02:00
Anton Khirnov
141fdc763c matroska: add the Opus mapping 2014-05-01 08:04:33 +02:00
Anton Khirnov
a1aa37dd0b matroskaenc: write CodecDelay 2014-05-01 08:03:51 +02:00
Alessandro Ghedini
1c0210c798 lavfi: add Bauer stereo-to-binaural audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-05-01 08:00:30 +02:00
Michael Niedermayer
91736025b2 avformat/avidec: set average frame rate from header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 05:40:00 +02:00
Michael Niedermayer
8bf90562f6 Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639' 
* commit 'eb3b5501e8b85bfea09d533314cb6920efc42639':
  matroskadec: read the CodecDelay element

Conflicts:
	libavformat/matroska.h
	libavformat/matroskadec.c

See: d6f86d74ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 04:29:40 +02:00
Michael Niedermayer
feaa31d354 ffmpeg: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 02:23:08 +02:00
Michael Niedermayer
82ccefb904 avformat/nut: support storing RFC 3389 comfort noise 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 02:13:31 +02:00
Michael Niedermayer
617e866e25 Move av_find_best_pix_fmt_of_2() from avcodec to avutil 
This avoids a dependancy of libavfilter on libavcodec

See Ticket 3592
Fixes Ticket2784

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 23:14:05 +02:00
Lukasz Marek
8ff72924cf lavd/opengl_enc: fix pixel data alignment 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 22:03:32 +02:00
Mickaël Raulet
bd4dc9e717 fate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 21:51:58 +02:00
Michael Niedermayer
a1ac27bc66 Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb' 
* commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb':
  librtmp: Map native options to librtmp ones when possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 21:43:56 +02:00
Michael Niedermayer
554a1ecab7 Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c' 
* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
  hls: Sync the file number with the start sequence

Conflicts:
	libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 21:29:04 +02:00
Michael Niedermayer
5b4c8aac97 Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5' 
* commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5':
  hls: Factor the sequence computation

Conflicts:
	libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 21:14:56 +02:00
Anton Khirnov
eb3b5501e8 matroskadec: read the CodecDelay element 2014-04-30 21:00:01 +02:00
Michael Niedermayer
8522dd380b Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb' 
* commit 'c7603b3c243331057300337a61464e6ac4a605cb':
  hls: Print start_number as first sequence value

Conflicts:
	libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 20:52:58 +02:00
Michael Niedermayer
67979b5936 Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818' 
* commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818':
  segment: Report the current media sequence

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 20:14:50 +02:00
Michael Niedermayer
f21f969a3f Merge commit '344f7b5a7e0d50573dec402dfe6228676f3889d9' 
* commit '344f7b5a7e0d50573dec402dfe6228676f3889d9':
  hls: Report the current media sequence

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 20:03:06 +02:00
Luca Barbato
7d027b9d6d librtmp: Map native options to librtmp ones when possible 
Makes the two protocols nearly seamless.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-30 18:56:43 +02:00
Michael Niedermayer
0eb9482e32 avcodec/flacenc: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 18:28:40 +02:00
Michael Niedermayer
f08ca91b05 avcodec/ivi_common: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 18:27:51 +02:00
Michael Niedermayer
8532566e80 avcodec/mjpegdec: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 18:26:28 +02:00
Luca Barbato
7266e24f17 hls: Sync the file number with the start sequence 2014-04-30 17:52:49 +02:00
Luca Barbato
a16431034d hls: Factor the sequence computation 2014-04-30 17:52:33 +02:00
Luca Barbato
c7603b3c24 hls: Print start_number as first sequence value 
The option now behaves as expected.
 2014-04-30 17:52:17 +02:00
Luca Barbato
87a3ea3192 segment: Report the current media sequence 
Useful for debugging mostly.
 2014-04-30 17:52:03 +02:00
Luca Barbato
344f7b5a7e hls: Report the current media sequence 
Useful for debugging mostly.
 2014-04-30 17:51:50 +02:00
Michael Niedermayer
1e25afc181 avcodec/tiff: Support 410 and 440 YCbCr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 17:41:31 +02:00
Daniel Verkamp
5e7d21c7ad ff_put_wav_header: add flag to force WAVEFORMATEX 
Partially undoes commit 2c4e08d893:

    riff: always generate a proper WAVEFORMATEX structure in
    ff_put_wav_header

A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.

This flag is used in the Matroska muxer (the cause of the original
change) and in the ASF muxer, because the specifications for
these formats indicate explicitly that WAVEFORMATEX should be used.

Muxers for other formats will return to the original behavior of writing
PCMWAVEFORMAT when writing a header for raw PCM.

In particular, this causes raw PCM in WAV to generate the canonical
44-byte header expected by some tools.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 16:41:35 +02:00
Michael Niedermayer
bb6d00f014 Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavd/pulse_audio_enc: respect minreq while checking buffer fullness
  lavd/pulse_audio_enc: signal that buffer is still writable after write
  lavd/pulse_audio_enc: add pointer checks
  lavd/pulse_audio_enc: add more buffer attributes
  lavd/fbdev_dec: implement fbdev_get_device_list callback
  lavd/fbdev_enc: move list device code to fbdev_common
  lavd/fbdev_enc: remove redundant assignments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 14:34:59 +02:00
Michael Niedermayer
421b21ca8a sws: dont use the optimized 410->420 unscaled conversion when height%4 
Fixes Ticket3594
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 06:23:39 +02:00
Michael Niedermayer
f0c78b0769 avcodec/vorbisdec: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 05:23:44 +02:00
Michael Niedermayer
0a266cb55a avcodec/vorbisdec: try to workaround libvorbisenc bug 
Fixes Ticket3590

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 05:23:37 +02:00
Michael Niedermayer
5b393766ba Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 
* commit 'a7c5fddac8137654cb503295c4dfb6492df43643':
  avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:46:38 +02:00
Michael Niedermayer
37ce3188de Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521' 
* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521':
  h264: drop commented out cruft

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:38:13 +02:00
Lukasz Marek
5bef4878d3 lavd/pulse_audio_enc: respect minreq while checking buffer fullness 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:36:14 +02:00
Lukasz Marek
f817d55049 lavd/pulse_audio_enc: signal that buffer is still writable after write 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:36:06 +02:00
Lukasz Marek
a1e5be5c1a lavd/pulse_audio_enc: add pointer checks 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
954a8f4483 lavd/pulse_audio_enc: add more buffer attributes 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
e2ebaa0933 lavd/fbdev_dec: implement fbdev_get_device_list callback 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
279ff8d2f6 lavd/fbdev_enc: move list device code to fbdev_common 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
3050e53f2b lavd/fbdev_enc: remove redundant assignments 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Michael Niedermayer
b3d48c315d Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd' 
* commit 'c1f92d13589d431e576d719dd44427486a5e05cd':
  mpegvideo: remove unused MpegEncContext.b4_stride

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:28:51 +02:00