virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
79,296 Commits 37 Branches 400 Tags 460 MiB
5501f58e52
Commit Graph

11 Commits

Author SHA1 Message Date
Michael Niedermayer
955b31a751 Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52' 
* commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52':
  flac muxer: support reading updated extradata from side data

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 14:16:29 +02:00
Anton Khirnov
e19d48dfce flac muxer: support reading updated extradata from side data 2014-06-01 08:32:33 +02: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
Anton Khirnov
54ed488b1a flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files 2014-05-28 07:47:31 +02:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01:00
Justin Ruggles
06ebe9161e Put ff_flac_write_header() in a separate C file to allow it to be shared without 
duplicating code or adding a dependency on vorbiscomment.o.

Originally committed as revision 22652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 23:58:45 +00:00
Justin Ruggles
19de452a63 Move ff_flac_write_header() to flacenc.h, which removes the Matroska muxer's 
dependency on flacenc.o and fixes the unnecessary dependency on vorbiscomment.o.

Originally committed as revision 22639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 21:58:38 +00:00
James Darnley
66061a1220 Add VorbisComment writing to FLAC files. 
Patch by James Darnley <james darnley at gmail>.

Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 13:36:43 +00:00
Justin Ruggles
2578326f13 Share the function to write a raw FLAC header and use it in the Matroska 
muxer.

Originally committed as revision 17606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 02:41:53 +00:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00