ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,525 Commits 36 Branches 398 Tags 535 MiB
cf3a038f50
Commit Graph

63525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
cf3a038f50 avformat/matroskaenc: fix ident string 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 15:15:14 +02:00
Michael Niedermayer
175aeab0b4 Merge commit 'b5aa48551300eed678aaea86ced7086758598a35' 
* commit 'b5aa48551300eed678aaea86ced7086758598a35':
  ppc: Move vec_unaligned_load macro to util_altivec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 14:53:55 +02:00
Michael Niedermayer
2320731614 Merge commit '593886b5dd2b583657aa3fd80bb173f702c9710d' 
* commit '593886b5dd2b583657aa3fd80bb173f702c9710d':
  ppc: util_altivec: Drop unused macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 14:44:55 +02:00
Michael Niedermayer
61917a104e Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59' 
* commit '106b62f4ba600f24415eaded5e020aeceb23fd59':
  matroskaenc: write the channel mask for FLAC

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 13:19:26 +02:00
Michael Niedermayer
dff4aa6afd Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104' 
* commit 'efcde917af407a6031ecff68edd51fce7b83d104':
  vorbiscomment: simplify API by using av_dict_count()

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 13:08:50 +02:00
Michael Niedermayer
579e2b2874 Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f' 
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
  matroskadec: parse the channel layout mask for FLAC

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 13:02:19 +02:00
Michael Niedermayer
1c0ce2d4e0 Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0' 
* commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:49:28 +02:00
Michael Niedermayer
69de229bb8 Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c' 
* commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c':
  matroskadec: split parsing tracks into a separate function

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:41:35 +02:00
Michael Niedermayer
40beec6a43 Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0' 
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
  flac: make avpriv_flac_parse_block_header() inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:33:49 +02:00
Diego Biurrun
b5aa485513 ppc: Move vec_unaligned_load macro to util_altivec 
This allows reusing it from multiple files.
 2014-05-28 03:29:33 -07:00
Michael Niedermayer
61301ca786 Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c' 
* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:28:23 +02:00
Michael Niedermayer
03ffaed3f0 Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd' 
* commit 'd6b9ce99ea384fb676561461768b8316725a4ccd':
  flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:21:50 +02:00
Michael Niedermayer
ef13967e60 Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362' 
* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362':
  flacdec: do not overwrite a channel layout set by the caller

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:20:12 +02:00
Diego Biurrun
593886b5dd ppc: util_altivec: Drop unused macros 2014-05-28 03:11:24 -07:00
Anton Khirnov
106b62f4ba matroskaenc: write the channel mask for FLAC 2014-05-28 07:55:14 +02:00
Anton Khirnov
efcde917af vorbiscomment: simplify API by using av_dict_count() 2014-05-28 07:54:54 +02:00
Anton Khirnov
23f741f793 matroskadec: parse the channel layout mask for FLAC 
It is commonly stored in a vorbiscomment block in codec private data.
 2014-05-28 07:50:32 +02:00
Anton Khirnov
4efdadc8ec matroskadec: export just the STREAMINFO block as FLAC extradata 
It contains all information that is used by the decoder and the other
FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.
 2014-05-28 07:49:15 +02:00
Anton Khirnov
6df478bf89 matroskadec: split parsing tracks into a separate function 2014-05-28 07:48:59 +02:00
Anton Khirnov
5fdaf312c5 flac: make avpriv_flac_parse_block_header() inline 
This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.
 2014-05-28 07:48:30 +02:00
Anton Khirnov
54ed488b1a flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files 2014-05-28 07:47:31 +02:00
Anton Khirnov
d6b9ce99ea flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag 
It is used to store the channel mask for non-standard layouts.
 2014-05-28 07:47:15 +02:00
Anton Khirnov
f13ffb6636 flacdec: do not overwrite a channel layout set by the caller 
The channel layout mask for non-standard layouts is typically stored at
the container level (as a vorbiscomment tag) for FLAC.
 2014-05-28 07:46:04 +02:00
Lukasz Marek
8518da23f5 ffmpeg: add -devices param 
FFmpeg mix devices and file formats when -formats option is used.
This commit adds a -devices param to list devices only.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 03:52:50 +02:00
Lazaros Koromilas
bbc10a1aa5 libavformat/utils: Fix segfault on m4a cover artwork parsing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 03:35:39 +02:00
Thierry Foucu
12875df324 Timecode: Support 48fps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 03:25:41 +02:00
Michael Niedermayer
919c320f72 avformat/oggenc: fix EOS flag 
This corrects the bug that caused the checksums to change in
9767d7c092

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 01:12:18 +02:00
Michael Niedermayer
b5657516b2 Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b' 
* commit '9767d7c092c890ecc5953452e8a951fd902dd67b':
  oggenc: Flush after writing headers

Conflicts:
	tests/ref/lavf/ogg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 01:00:10 +02:00
Michael Niedermayer
5313d60dc0 Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1' 
* commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1':
  oggenc: Move ogg_write_pages up above ogg_write_header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 00:28:08 +02:00
Michael Niedermayer
48a6916308 Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c' 
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
  dsputil: Split off HuffYUV encoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvenc.c
	libavcodec/pngenc.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 00:03:59 +02:00
Michael Niedermayer
e2abc0d5ca Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d' 
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvdec.c
	libavcodec/lagarith.c
	libavcodec/vble.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 23:16:06 +02:00
Michael Niedermayer
43c57dbe14 Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58' 
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
  h264_picture: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 22:34:16 +02:00
Michael Niedermayer
d84286b1ea Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0' 
* commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0':
  on2avc: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 22:29:11 +02:00
Michael Niedermayer
5be8c27694 avformat/rtspdec: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Michael Niedermayer
2870617853 avcodec/vp3: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Michael Niedermayer
0674da997a avcodec/cavs: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Lou Logan
8a64ea768b doc/filters: amix only supports float samples 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-05-27 10:23:57 -08:00
Andrew Kelley
9767d7c092 oggenc: Flush after writing headers 
Before, header information for ogg format files was sent with the
first encoded packet.

This patch makes it so that it is possible for API users to
differentiate between headers and encoded audio. This is useful, for
example, when creating an audio stream where you want to send one set
of headers for every client that connects and then the encoded stream
of audio.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-27 20:16:59 +03:00
Andrew Kelley
1d3eb0b573 oggenc: Move ogg_write_pages up above ogg_write_header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-27 20:16:58 +03:00
Michael Niedermayer
1853e2cba9 avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 18:22:09 +02:00
Diego Biurrun
512f3ffe9b dsputil: Split off HuffYUV encoding bits into their own context 
Also shorten HuffYUV context member names to avoid clutter.
 2014-05-27 08:54:53 -07:00
Diego Biurrun
0d439fbede dsputil: Split off HuffYUV decoding bits into their own context 
Also shorten HuffYUV context member names to avoid clutter.
 2014-05-27 08:52:34 -07:00
Michael Niedermayer
0d26264fb4 avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:52:24 +02:00
Michael Niedermayer
ee0c91cc65 avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:36 +02:00
Michael Niedermayer
515e8aed03 avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:21 +02:00
Michael Niedermayer
e10ac3a12e avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:07 +02:00
Michael Niedermayer
cfa0ad6eec avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:45 +02:00
Michael Niedermayer
1dbc98461b avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:15 +02:00
Michael Niedermayer
c0f8801e47 avfilter/il: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:02 +02:00
Michael Niedermayer
5feac96fdb avfilter/hflip: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:43:46 +02:00