generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
39,093 Commits 24 Branches 241 Tags 173 MiB
9407cf137f
Commit Graph

39093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
0ee5be4ee4 bytestream: add functions for accessing size of buffer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:05:19 +01:00
Paul B Mahol
841e669a39 cdxl: swap CHUNKY and BYTE_PLANAR 
This is how it is defined in Amiga Developer CD from year 1992 and
is consistent with files created with ADPro.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:03:33 +01:00
Michael Niedermayer
3eaf712053 sgienc: fix packet size. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 02:54:49 +01:00
Michael Niedermayer
0ebd83617f Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  avconv: free packet in write_frame() when discarding due to frame number limit
  FATE: use +/- flag option syntax for vp8 emu-edge tests
  lavf: make av_interleave_packet_per_dts() private.
  lavf: deprecate av_read_packet().
  oggdec: output correct timestamps for Vorbis
  avconv: pass input stream timestamps to audio encoders
  lavc: shrink encoded audio packet size after encoding.
  xa: set correct bit rate
  xa: do not set bit_rate, block_align, or bits_per_coded_sample
  xa: fix end-of-file handling
  xa: fix timestamp calculation
  bink: fix typo in FFALIGN() argument
  bink: align plane width to 8 when calculating bundle sizes
  doc: pass -Idoc texi2html and texi2pod
  doc: texi2pod: add -I flag
  movenc: Add a min_frag_duration option
  rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
  libavformat: Set the default for the max_delay option to -1
  Generate manpages for AV{Format,Codec}Context AVOptions.
  doc/avconv: remove entries for AVOptions.
  ...

Conflicts:
	doc/Makefile
	doc/ffmpeg.texi
	doc/muxers.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/options.c
	libavcodec/vp8.c
	libavformat/options.c
	tests/fate/demux.mak
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 01:33:53 +01:00
Justin Ruggles
b0f75ba272 mpegaudioenc: use AVCodec.encode2() 
Update FATE references due to encoder delay.
 2012-03-20 18:56:22 -04:00
Justin Ruggles
3d853d7ab3 libmp3lame: use AVCodec.encode2() 2012-03-20 18:56:18 -04:00
Justin Ruggles
1987a940b7 libgsmenc: use AVCodec.encode2() 2012-03-20 18:55:39 -04:00
Justin Ruggles
d1afb2f94e libfaac: use AVCodec.encode2() 
Encoder output is delayed by several frames, so we keep a queue of input
frame timing info to match up with corresponding output packets.
 2012-03-20 18:55:36 -04:00
Justin Ruggles
59041fd053 g726enc: use AVCodec.encode2() 2012-03-20 18:47:23 -04:00
Justin Ruggles
bb03b6f7b1 g722enc: use AVCodec.encode2() 
FATE reference updated due timestamp rounding because of resampling from
44100 Hz to 16000 Hz in avconv.
 2012-03-20 18:47:23 -04:00
Justin Ruggles
910bdb9a42 flacenc: use AVCodec.encode2() 2012-03-20 18:47:19 -04:00
Justin Ruggles
24e74f0a0f adpcmenc: update to AVCodec.encode2() 2012-03-20 18:46:57 -04:00
Justin Ruggles
aa872af5e3 ac3enc: update to AVCodec.encode2() 
Update FATE references due to encoder delay.
 2012-03-20 18:46:56 -04:00
Justin Ruggles
ad95307f92 aacenc: use AVCodec.encode2() 2012-03-20 18:46:49 -04:00
Michael Niedermayer
745a33a443 fate/zerocodec: fix permissions 
Reported-by: Deamon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 21:21:14 +01:00
Justin Ruggles
4bf64961a9 avcodec: add code for a frame queue for use by audio encoders with delay 
This simplifies matching of timestamps between input frames and output
packets.
 2012-03-20 16:04:21 -04:00
Justin Ruggles
c9594fe0fb avconv: free packet in write_frame() when discarding due to frame number limit 
Fixes a memleak when using the -frames option with audio.
 2012-03-20 15:51:58 -04:00
Justin Ruggles
e056f8d37d FATE: use +/- flag option syntax for vp8 emu-edge tests 2012-03-20 15:51:58 -04:00
Michael Niedermayer
15db6a9590 pngenc: Fix incorrect mask used for interlaced mode. 
Fixes Ticket1109

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 20:39:32 +01:00
Anton Khirnov
a6733202cc lavf: make av_interleave_packet_per_dts() private. 
There is no reason for it to be public, it's only meant to be used
internally.
 2012-03-20 20:12:16 +01:00
Anton Khirnov
3c90cc2ef2 lavf: deprecate av_read_packet(). 
The caller can achieve the same effect (i.e. getting raw unparsed/mangled
packets) with av_read_frame() and AVFMT_FLAG_NOPARSE |
AVFMT_FLAG_NOFILLIN
 2012-03-20 20:12:16 +01:00
Justin Ruggles
f63412fc74 oggdec: output correct timestamps for Vorbis 
Takes encoder delay into account by comparing first the coded page
duration with the calculated page duration. Handles last packet duration
if needed, also by comparing coded duration with calculated duration.
Also does better handling of timestamp generation for packets in the
first page for streamed ogg files where the start time is not
necessarily zero.
 2012-03-20 14:39:57 -04:00
Justin Ruggles
9b9fc9ba32 avconv: pass input stream timestamps to audio encoders 
5 FATE test references updated due to using demuxer-generated timestamps that
are either not sample-accurate or are slightly off in the input file.
 2012-03-20 14:12:54 -04:00
Justin Ruggles
a1977e0103 lavc: shrink encoded audio packet size after encoding. 2012-03-20 14:12:54 -04:00
Justin Ruggles
777365fe86 xa: set correct bit rate 
Also fixes stream duration calculation.
 2012-03-20 14:12:54 -04:00
Justin Ruggles
a54bc52265 xa: do not set bit_rate, block_align, or bits_per_coded_sample 
The values in the header refer to decoded data, not compressed data.
 2012-03-20 14:12:53 -04:00
Justin Ruggles
64de57f645 xa: fix end-of-file handling 
Do not output an extra packet when out_size is reached.
Also return AVERROR_EOF instead of AVERROR(EIO).
 2012-03-20 14:12:53 -04:00
Justin Ruggles
cd2ffb67ad xa: fix timestamp calculation 
The packet duration is always 28 samples.
 2012-03-20 14:12:53 -04:00
Kostya Shishkov
1d10afd581 bink: fix typo in FFALIGN() argument 2012-03-20 18:57:51 +01:00
Kostya Shishkov
8ae28ac0f3 bink: align plane width to 8 when calculating bundle sizes 
This fixes decoding of Bink files with non-multiple-of-16 width.
 2012-03-20 16:33:57 +01:00
Michael Niedermayer
8f394a6cf8 pngdec: print error message for truncated pngs even if we output them 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 14:13:01 +01:00
Michael Niedermayer
309d8ec19b pngenc: allocate packets that have some chance of being large enough. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 14:12:16 +01:00
Tomas Härdin
393b81f093 mxfdec: Only parse next partition pack if parsing forward 
This fixes ticket #1099.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 13:45:19 +01:00
Michael Niedermayer
4ed47d3354 pngdec: dont discard incomplete images. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 13:45:19 +01:00
Michael Niedermayer
eeb792d862 pngdec: Print error messages for the various failure pathes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 13:45:19 +01:00
Mans Rullgard
2ac3df858c doc: pass -Idoc texi2html and texi2pod 
This fixes doc generation in build tree separate from source.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-03-20 11:10:25 +00:00
Mans Rullgard
b8b207e896 doc: texi2pod: add -I flag 
This allows specifying additional directories to search for
@include files.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-03-20 11:10:25 +00:00
Martin Storsjö
39f5a5462c movenc: Add a min_frag_duration option 
The other fragmentation options (frag_duration, frag_size and
frag_keyframe) are combined with OR, cutting fragments at the
first of the conditions being fulfilled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 11:18:05 +02:00
Martin Storsjö
ccfa8aa26f rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers 
This enables reordering of UDP packets by default, unless the caller
explicitly sets -max_delay 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 10:53:49 +02:00
Martin Storsjö
4fa57d524f libavformat: Set the default for the max_delay option to -1 
Make the muxers/demuxers that use the field handle the default
-1 in the same way as 0.

This allows distinguishing an intentionally set 0 from the default
value where the user hasn't set it.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 10:53:47 +02:00
Clément Bœsch
9dd649c004 flv: clarify use of video info/cmd frame. 
Also add generated key frame in the enum, and doxycomment the existing
ones. Descriptions are directly taken from the public specifications.
 2012-03-20 07:53:40 +01:00
Anton Khirnov
0d0b81f941 Generate manpages for AV{Format,Codec}Context AVOptions. 2012-03-20 07:10:06 +01:00
Anton Khirnov
4fea8959d8 doc/avconv: remove entries for AVOptions. 
Documentation for those will be generated automatically.
 2012-03-20 07:09:54 +01:00
Anton Khirnov
5626697104 Move AVFormatContext/AVCodecContext option tables to separate files. 
This will allow us to automatically generate manpages for them.
 2012-03-20 07:09:18 +01:00
Anton Khirnov
40b41be3fa lavf: use AVStream.discard to disable queueing attached pictures. 2012-03-20 06:53:44 +01:00
Anton Khirnov
01fcc42b90 lavf: requeue attached pictures after seeking. 
This allows the caller to get them without special code even after
seeking before receiving any data.
 2012-03-20 06:52:33 +01:00
Anton Khirnov
713f3062a7 id3v2: set the keyframe flag on attached pictures. 2012-03-20 06:52:07 +01:00
Derek Buitenhuis
30f2d97afe zerocodec: Fix license 
ISC doesn't contain this line, so remove it to
prevent confusion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 05:01:32 +01:00
Derek Buitenhuis
41bd3519b0 FATE: Add ZeroCodec test 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 05:00:13 +01:00
Michael Niedermayer
e01f478dd2 ffv1enc: Check context_model 
Fixes crash

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 00:29:34 +01:00