virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
61,806 Commits 37 Branches 400 Tags 460 MiB
4a031ce3c6
Commit Graph

30 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
862174ec83 Move GUID-related objects to riffenc.c and riff.c. 
This simplifies the following eac3-in-wav patch.
 2014-01-29 00:44:59 +01:00
Peter Ross
e93a73cbef wtvenc: output ff_format_none if ff_put_wav_header fails 
This occurs when muxing E-AC-3.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-23 19:51:32 +01:00
Peter Ross
e4be076570 wtvenc: use codec tag + MEDIASUBTYPE_BASE_GUID, if there is no suitable guid 
This permits H264, AAC, AAC-LATM muxing.

Fixes ticket #536.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-23 19:51:17 +01:00
Peter Ross
6da21c1f81 wtvenc: populate VIDEOINFOHEADER2 
Fixes ticket #2835.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-23 15:55:54 +01:00
Paul B Mahol
38fefbc474 wtvenc: use ffio_fill() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 18:14:43 +00:00
Michael Niedermayer
6d02bdc338 vformat/wtvenc: fix doxygen comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Clément Bœsch
8de9bb6e5e lavf: remove some flushing in write_packet muxers callbacks. 
Since 4f112a8e3, this is not necessary anymore. Also, it allows to
actually disable the flushing.
 2013-04-14 21:16:53 +02:00
Peter Ross
801b636633 wtvenc: mux thumbnail picture 2013-01-07 23:14:58 +11:00
Peter Ross
95015634f5 wtv: permit root table and first sectors to be located beyond 2GB boundary 
Fixes ticket #2025.

Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-19 00:18:17 +11:00
Clément Bœsch
41ebbb3b04 lavf/wtvenc: fix s[tp]_pairs memleak. 2012-11-13 20:02:43 +01:00
Peter Ross
a373f35272 wtvenc: produce seekable files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:59:03 +01:00
Peter Ross
b89cd2a028 wtvenc: simplify write_timestamp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:51:38 +01:00
Peter Ross
3e65134326 wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:45:01 +01:00
Peter Ross
0d9435048c wtvenc: indent fixup 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:44:50 +01:00
Peter Ross
b50759cd6b wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:42:01 +01:00
Peter Ross
e6ef628b1e wtv: move duplicated guids into wtv.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:52:33 +01:00
Peter Ross
1701a22fce wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:51:41 +01:00
Peter Ross
9632f5efcf wtvenc: fix typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:50:36 +01:00
Michael Niedermayer
bb2f13c19f rename missed CodecID to AVCodecID 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 23:57:21 +02:00
Michael Niedermayer
7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 22:45:46 +02:00
Clément Bœsch
215b7724e7 lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
Clément Bœsch
4da45aff28 cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
Carl Eugen Hoyos
5f36065ca6 Use AC-3 as default codec for wtv. 2011-11-12 00:15:03 +01:00
Peter Ross
b372723f6a wtvenc: ensure fat tables are padded to the sector boundary 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 02:40:31 +01:00
Peter Ross
42b5a6f634 wtvenc: use ff_put_guid and remove local copy of this function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-05 16:51:26 +01:00
Peter Ross
1efe4ff91d wtvenc: add @file comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-05 16:51:25 +01:00
Peter Ross
3852c29fd4 fix whitespace nits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-05 16:51:25 +01:00
Aurelien Jacobs
c894449fc4 act, bintext, wtvenc: use named struct initializers 2011-09-26 00:22:41 +02:00
Michael Niedermayer
6a507ccfe5 wtvenc: add some asserts because iam paranoid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 01:08:01 +02:00
zhentan feng
438debd095 WTV muxer (2_wtvenc.patch, 3_add_wtv_muxer.patch) 2011-09-14 00:41:25 +02:00