ffmpeg.git
7 years agoupdate for 0.9 n0.9
Michael Niedermayer [Sun, 11 Dec 2011 20:11:40 +0000 (21:11 +0100)]
update for 0.9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoseektest: floatfree
Michael Niedermayer [Sun, 11 Dec 2011 18:21:39 +0000 (19:21 +0100)]
seektest: floatfree

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/ffmpeg.texi
Michael Niedermayer [Sun, 11 Dec 2011 17:50:39 +0000 (18:50 +0100)]
doc/ffmpeg.texi
Merge changes done to avconv.texi since the last merge into ffmpeg.texi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport VP8 in NSV.
Reimar Döffinger [Sun, 11 Dec 2011 14:51:12 +0000 (15:51 +0100)]
Support VP8 in NSV.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoregressiontest: try mp2 for wtv
Michael Niedermayer [Sun, 11 Dec 2011 16:44:13 +0000 (17:44 +0100)]
regressiontest: try mp2 for wtv
our ac3 decoder outputs different things on different platforms.

Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoregressiontest: try to fix wtv
Michael Niedermayer [Sun, 11 Dec 2011 15:19:10 +0000 (16:19 +0100)]
regressiontest: try to fix wtv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolife: add mold, mold_color, life_color and death_color options.
Clément Bœsch [Fri, 9 Dec 2011 01:33:01 +0000 (02:33 +0100)]
life: add mold, mold_color, life_color and death_color options.

7 years agolife: add seed information in filter summary.
Clément Bœsch [Sun, 11 Dec 2011 12:36:53 +0000 (13:36 +0100)]
life: add seed information in filter summary.

7 years agolavfi: add cellauto source
Stefano Sabatini [Thu, 8 Dec 2011 17:07:52 +0000 (18:07 +0100)]
lavfi: add cellauto source

7 years agoAdd caf format regression test.
Reimar Döffinger [Sat, 10 Dec 2011 23:34:32 +0000 (00:34 +0100)]
Add caf format regression test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoEnable already existing rso regression test.
Reimar Döffinger [Sat, 10 Dec 2011 23:30:11 +0000 (00:30 +0100)]
Enable already existing rso regression test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoAdd regression test for "sox" format muxer/demuxer.
Reimar Döffinger [Sat, 10 Dec 2011 23:21:47 +0000 (00:21 +0100)]
Add regression test for "sox" format muxer/demuxer.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoAdd wtv seek test.
Reimar Döffinger [Sat, 10 Dec 2011 23:20:34 +0000 (00:20 +0100)]
Add wtv seek test.

I am not entirely sure the seek functionality is working correctly,
there are some strange cases like successful seek but no dts value.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoAdd wtv lavf regression test.
Reimar Döffinger [Sat, 10 Dec 2011 23:00:42 +0000 (00:00 +0100)]
Add wtv lavf regression test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMAINTAINERS: extend syntax for entries
Michael Niedermayer [Wed, 7 Dec 2011 20:44:38 +0000 (21:44 +0100)]
MAINTAINERS: extend syntax for entries

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoCorrect use of OSX to Mac OS X and properly format yasm providers on Mac OS X
Hanspeter Niederstrasser [Sun, 11 Dec 2011 00:56:48 +0000 (19:56 -0500)]
Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 10 Dec 2011 23:40:09 +0000 (00:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (21 commits)
  Warn about avserver being broken.
  avconv: drop code for special handling of avserver streams.
  rawdec: don't set codec timebase.
  lavf doxy: add muxing stuff to lavf_encoding group
  lavf doxy: add demuxing stuff to lavf_decoding group
  lavf doxy: expand/reword metadata API doxy.
  lavf doxy: add installed headers to groups.
  lavf doxy: add avio groups into the lavf_io group.
  lavf doxy: rename lavf I/O group to lavf_io.
  lavf doxy: add metadata docs to the main lavf group
  ttadec: check channel count as read from extradata.
  Add CLJR encoding and decoding regression tests
  cljr: remove unused code
  flacdec: Support for tracks in cuesheet metadata block
  ptx: fix inverted check for sufficient data
  flac muxer: fix writing of file header and STREAMINFO header from extradata
  ptx: emit a warning on insufficient picture data
  utvideo: add fate tests covering all codec variants
  doc: update to refer to avconv
  doc: remove some stale entries from the faq
  ...

Conflicts:
Changelog
avconv.c
doc/avconv.texi
doc/faq.texi
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/avcodec.h
libavcodec/cljr.c
libavformat/avformat.h
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeval.texi: document that variables are not shared between expressions.
Michael Niedermayer [Sat, 10 Dec 2011 22:36:30 +0000 (23:36 +0100)]
eval.texi: document that variables are not shared between expressions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Fix concealment regression introduced by babf4fe01a808327d53977ba319c113a930180b1
Michael Niedermayer [Sat, 10 Dec 2011 22:26:38 +0000 (23:26 +0100)]
h264: Fix concealment regression introduced by babf4fe01a808327d53977ba319c113a930180b1
Limit the new case to when the decoder is flushed instead of at each idr frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: reset prev_poc_msb to the same value everywhere.
Michael Niedermayer [Sat, 10 Dec 2011 22:03:49 +0000 (23:03 +0100)]
h264: reset prev_poc_msb to the same value everywhere.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoWarn about avserver being broken.
Anton Khirnov [Sat, 10 Dec 2011 17:30:03 +0000 (18:30 +0100)]
Warn about avserver being broken.

Also remove mentions of it from other avtools' manuals.

7 years agoavconv: drop code for special handling of avserver streams.
Anton Khirnov [Sat, 10 Dec 2011 16:33:52 +0000 (17:33 +0100)]
avconv: drop code for special handling of avserver streams.

It's broken and doesn't work anyway.

This patch means that avconv will ignore encoding options from the ffm
file and will instead use whatever is provided on the commandline as for
normal output.

7 years agorawdec: don't set codec timebase.
Anton Khirnov [Sat, 10 Dec 2011 11:40:05 +0000 (12:40 +0100)]
rawdec: don't set codec timebase.

It's not supposed to be set outside of lavc. Set r_frame_rate and
avg_frame_rate instead.

7 years agolavf doxy: add muxing stuff to lavf_encoding group
Anton Khirnov [Sat, 10 Dec 2011 20:04:30 +0000 (21:04 +0100)]
lavf doxy: add muxing stuff to lavf_encoding group

7 years agolavf doxy: add demuxing stuff to lavf_decoding group
Anton Khirnov [Sat, 10 Dec 2011 20:04:30 +0000 (21:04 +0100)]
lavf doxy: add demuxing stuff to lavf_decoding group

7 years agolavf doxy: expand/reword metadata API doxy.
Anton Khirnov [Sat, 10 Dec 2011 19:39:39 +0000 (20:39 +0100)]
lavf doxy: expand/reword metadata API doxy.

7 years agolavf doxy: add installed headers to groups.
Anton Khirnov [Sat, 10 Dec 2011 19:16:57 +0000 (20:16 +0100)]
lavf doxy: add installed headers to groups.

7 years agolavf doxy: add avio groups into the lavf_io group.
Anton Khirnov [Sat, 10 Dec 2011 19:11:28 +0000 (20:11 +0100)]
lavf doxy: add avio groups into the lavf_io group.

7 years agolavf doxy: rename lavf I/O group to lavf_io.
Anton Khirnov [Sat, 10 Dec 2011 19:09:04 +0000 (20:09 +0100)]
lavf doxy: rename lavf I/O group to lavf_io.

7 years agolavf doxy: add metadata docs to the main lavf group
Anton Khirnov [Sat, 10 Dec 2011 19:06:49 +0000 (20:06 +0100)]
lavf doxy: add metadata docs to the main lavf group

7 years agoffmpeg: better warning about loop_input
Michael Niedermayer [Sat, 10 Dec 2011 20:00:38 +0000 (21:00 +0100)]
ffmpeg: better warning about loop_input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agottadec: check channel count as read from extradata.
Shitiz Garg [Sat, 10 Dec 2011 19:40:57 +0000 (01:10 +0530)]
ttadec: check channel count as read from extradata.

fixes floating-point exception due to channels being set to 0.
fixes Bug 128.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoAdd CLJR encoding and decoding regression tests
Paul B Mahol [Thu, 8 Dec 2011 23:42:02 +0000 (23:42 +0000)]
Add CLJR encoding and decoding regression tests

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agocljr: remove unused code
Paul B Mahol [Fri, 9 Dec 2011 00:45:27 +0000 (00:45 +0000)]
cljr: remove unused code

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoflacdec: Support for tracks in cuesheet metadata block
Paul B Mahol [Sat, 10 Dec 2011 04:53:30 +0000 (04:53 +0000)]
flacdec: Support for tracks in cuesheet metadata block

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoRun zmbv regression without md5sum.
Reimar Döffinger [Sat, 10 Dec 2011 18:33:27 +0000 (19:33 +0100)]
Run zmbv regression without md5sum.

Judging by the differences this should make all FATE
machines pass the test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agortmpproto: make condition work in overflow case.
Reimar Döffinger [Sat, 10 Dec 2011 14:52:21 +0000 (15:52 +0100)]
rtmpproto: make condition work in overflow case.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMake detection of single-stream flv work again.
Reimar Döffinger [Wed, 7 Dec 2011 20:51:27 +0000 (21:51 +0100)]
Make detection of single-stream flv work again.

It had become dead code when code was added to avoid
exporting audio and video codec id as metadata.
Untested due to lack of sample.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoh264: improve "no picture" debug output.
Michael Niedermayer [Sat, 10 Dec 2011 17:42:52 +0000 (18:42 +0100)]
h264: improve "no picture" debug output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: switch from qatars has_b_frames calculation back to mine.
Michael Niedermayer [Sat, 10 Dec 2011 16:33:54 +0000 (17:33 +0100)]
h264: switch from qatars has_b_frames calculation back to mine.
Their 2nd try does like the first not work at all.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadpcm: fix division by zero in fate/creative/intro-partial.wav with -s 2 and -r 0...
Michael Niedermayer [Sat, 10 Dec 2011 13:55:23 +0000 (14:55 +0100)]
adpcm: fix division by zero in fate/creative/intro-partial.wav with -s 2 and -r 0.001:1

Bug-Found-by: Shitiz Garg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoptx: fix inverted check for sufficient data
Janne Grunau [Sat, 10 Dec 2011 15:57:32 +0000 (16:57 +0100)]
ptx: fix inverted check for sufficient data

Fix regression introduced in 2b53e69.

7 years agofftools: add -report option.
Nicolas George [Thu, 8 Dec 2011 13:42:24 +0000 (14:42 +0100)]
fftools: add -report option.

7 years agoflac muxer: fix writing of file header and STREAMINFO header from extradata
Justin Ruggles [Sat, 10 Dec 2011 03:51:30 +0000 (22:51 -0500)]
flac muxer: fix writing of file header and STREAMINFO header from extradata

fixes Bug 119

7 years agoptx: emit a warning on insufficient picture data
Janne Grunau [Sat, 10 Dec 2011 11:55:08 +0000 (12:55 +0100)]
ptx: emit a warning on insufficient picture data

Return the whole packet as consumed in this case and not the size the
packet should have had. Move the insufficient data check into the for
condition to fix a ISO C90 error on bigendian.

7 years agoutvideo: add fate tests covering all codec variants
Aneesh Dogra [Fri, 9 Dec 2011 00:31:33 +0000 (00:31 +0000)]
utvideo: add fate tests covering all codec variants

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agodoc: update to refer to avconv
Luca Barbato [Sat, 10 Dec 2011 00:58:04 +0000 (01:58 +0100)]
doc: update to refer to avconv

7 years agodoc: remove some stale entries from the faq
Luca Barbato [Sat, 10 Dec 2011 00:52:05 +0000 (01:52 +0100)]
doc: remove some stale entries from the faq

Some entries should be still amended.

7 years agoSeparate mxf_essence_container_uls for audio and video.
Carl Eugen Hoyos [Sat, 10 Dec 2011 13:58:57 +0000 (14:58 +0100)]
Separate mxf_essence_container_uls for audio and video.

It is a really bad idea to assign a video codec id
when we have set codec_type to audio and vice versa.

Fixes ticket #721.

7 years agomxfdec: do not try to use an obviously broken index.
Reimar Döffinger [Sat, 10 Dec 2011 10:51:41 +0000 (11:51 +0100)]
mxfdec: do not try to use an obviously broken index.

Also fixes a memleak.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoDxtory capture format decoder
Kostya Shishkov [Fri, 9 Dec 2011 10:06:02 +0000 (11:06 +0100)]
Dxtory capture format decoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavc: 1000l, unbreak ABI
Michael Niedermayer [Sat, 10 Dec 2011 06:03:20 +0000 (07:03 +0100)]
lavc: 1000l, unbreak ABI

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavi: add escape130 support
Michael Niedermayer [Sat, 10 Dec 2011 05:54:05 +0000 (06:54 +0100)]
avi: add escape130 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoamvenc: support videos with heights that are not a multiple of 16.
Michael Niedermayer [Sat, 10 Dec 2011 05:39:57 +0000 (06:39 +0100)]
amvenc: support videos with heights that are not a multiple of 16.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavdec: add ignore length option to ignore incorrect lengthes
Michael Niedermayer [Sat, 10 Dec 2011 04:42:18 +0000 (05:42 +0100)]
wavdec: add ignore length option to ignore incorrect lengthes
like SOX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadd missing long_name for amv and dca encoder
Paul B Mahol [Sat, 10 Dec 2011 03:29:41 +0000 (03:29 +0000)]
add missing long_name for amv and dca encoder

Reviewed-by: Carl Eugen Hoyos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMakefile: disable compiling avconv by default.
Michael Niedermayer [Sat, 10 Dec 2011 03:41:43 +0000 (04:41 +0100)]
Makefile: disable compiling avconv by default.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomlp: Use correct speaker locations in TrueHD channel layout.
Hendrik Leppkes [Sun, 4 Dec 2011 21:54:22 +0000 (22:54 +0100)]
mlp: Use correct speaker locations in TrueHD channel layout.
(cherry picked from commit d7787835ad737d4f4d8b6f17e04d981632eeaa91)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 10 Dec 2011 00:25:15 +0000 (01:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  isom: sort and pretty-print codec_movaudio_tags[]
  isom: remove pointless comments in codec_movaudio_tags[]
  isom: remove commented-out tag for vorbis
  movenc: write 'chan' tag for AC-3 in MOV
  mov: add support for reading and writing the 'chan' tag
  audioconvert: add some additional channel and channel layout macros
  audioconvert: change 7.1 "wide" layout to use side surround channels
  movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs
  doc: update documentation to use avconv
  doc: update demuxers section
  doc: extend external library coverage
  doc: split platform specific information
  doc: port the git-howto to texinfo
  doc: provide fallback css and customize @float
  doc: document fate in a texinfo
  doxy: change hue value to match our green

Conflicts:
doc/fate.txt
doc/ffserver.texi
doc/general.texi
doc/muxers.texi
doc/protocols.texi
doc/t2h.init
libavformat/isom.c
libavformat/mov.c
libavutil/avutil.h
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovb: Add some checks on input buffer related values.
Michael Niedermayer [Fri, 9 Dec 2011 22:46:16 +0000 (23:46 +0100)]
vb: Add some checks on input buffer related values.
Fixes crash with INTRO_FAIL.VB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibx264: workaround a bug in some versions of flash player
Michael Niedermayer [Fri, 9 Dec 2011 21:34:11 +0000 (22:34 +0100)]
libx264: workaround a bug in some versions of flash player
Fixes Ticket570

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoisom: sort and pretty-print codec_movaudio_tags[]
Justin Ruggles [Tue, 6 Dec 2011 23:02:14 +0000 (18:02 -0500)]
isom: sort and pretty-print codec_movaudio_tags[]

original order is retained within the same tag or codec id to maintain the
muxing/demuxing priority.

7 years agoisom: remove pointless comments in codec_movaudio_tags[]
Justin Ruggles [Tue, 6 Dec 2011 22:54:07 +0000 (17:54 -0500)]
isom: remove pointless comments in codec_movaudio_tags[]

7 years agoisom: remove commented-out tag for vorbis
Justin Ruggles [Tue, 6 Dec 2011 22:51:54 +0000 (17:51 -0500)]
isom: remove commented-out tag for vorbis

7 years agomovenc: write 'chan' tag for AC-3 in MOV
Justin Ruggles [Tue, 6 Dec 2011 22:35:37 +0000 (17:35 -0500)]
movenc: write 'chan' tag for AC-3 in MOV

7 years agomov: add support for reading and writing the 'chan' tag
Justin Ruggles [Sat, 3 Dec 2011 18:32:45 +0000 (13:32 -0500)]
mov: add support for reading and writing the 'chan' tag

This implements reading the tag in the demuxer and adds support for writing it
in the muxer. Some example channel layout tables for muxing are included for
ac3, aac, and alac, but they are not utilized yet.

7 years agoaudioconvert: add some additional channel and channel layout macros
Justin Ruggles [Tue, 6 Dec 2011 20:53:02 +0000 (15:53 -0500)]
audioconvert: add some additional channel and channel layout macros

7 years agoaudioconvert: change 7.1 "wide" layout to use side surround channels
Justin Ruggles [Tue, 6 Dec 2011 20:38:55 +0000 (15:38 -0500)]
audioconvert: change 7.1 "wide" layout to use side surround channels

7 years agomovenc: simplify handling of pcm vs. adpcm vs. other compressed codecs
Justin Ruggles [Fri, 2 Dec 2011 20:51:52 +0000 (15:51 -0500)]
movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs

Use Sound Sample Description Version 2 for all MOV files.
Updated FATE references accordingly.
Note that ADPCM is treated as compressed audio in version 2.

7 years agocljrenc: 2x2 ordered dither support.
Michael Niedermayer [Fri, 9 Dec 2011 17:32:29 +0000 (18:32 +0100)]
cljrenc: 2x2 ordered dither support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocljrenc: add AVOption to disable dither
Michael Niedermayer [Fri, 9 Dec 2011 05:01:15 +0000 (06:01 +0100)]
cljrenc: add AVOption to disable dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: update documentation to use avconv
Luca Barbato [Thu, 8 Dec 2011 16:39:28 +0000 (17:39 +0100)]
doc: update documentation to use avconv

7 years agodoc: update demuxers section
Luca Barbato [Thu, 8 Dec 2011 16:20:17 +0000 (17:20 +0100)]
doc: update demuxers section

Cleanup tags usage and update commandline examples.

7 years agodoc: extend external library coverage
Luca Barbato [Sat, 3 Dec 2011 20:50:19 +0000 (21:50 +0100)]
doc: extend external library coverage

7 years agodoc: split platform specific information
Luca Barbato [Sat, 3 Dec 2011 20:25:04 +0000 (21:25 +0100)]
doc: split platform specific information

Move the platform-specific information in its own file.

7 years agodoc: port the git-howto to texinfo
Luca Barbato [Sat, 3 Dec 2011 17:06:14 +0000 (18:06 +0100)]
doc: port the git-howto to texinfo

7 years agodoc: provide fallback css and customize @float
Luca Barbato [Sat, 3 Dec 2011 22:24:50 +0000 (23:24 +0100)]
doc: provide fallback css and customize @float

Add "note" or "important" class to the generated div.

7 years agodoc: document fate in a texinfo
Luca Barbato [Fri, 2 Dec 2011 00:33:07 +0000 (01:33 +0100)]
doc: document fate in a texinfo

Summarize the information provided in the wiki and the one provided
in fate.txt

7 years agofilters.texi: remove confusing reference to never integrated -af option
Stefano Sabatini [Fri, 9 Dec 2011 14:52:40 +0000 (15:52 +0100)]
filters.texi: remove confusing reference to never integrated -af option

7 years agodoxy: change hue value to match our green
Luca Barbato [Thu, 8 Dec 2011 13:29:26 +0000 (14:29 +0100)]
doxy: change hue value to match our green

7 years agocljrenc: Add dither to avoid the banding artifcats caused by the very low
Michael Niedermayer [Fri, 9 Dec 2011 00:11:06 +0000 (01:11 +0100)]
cljrenc: Add dither to avoid the banding artifcats caused by the very low
number of bits used to represent brightness levels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 8 Dec 2011 23:05:51 +0000 (00:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cljr: K&R cosmetics
  cljr: return a more sensible value when encountering invalid headers
  cljr: drop unnecessary emms_c() calls without MMX code
  cljr: remove useless casts
  cljr: group encode/decode parts under single ifdefs
  cljr: remove stray semicolon
  cljr: add missing return statement in decode_end()
  doc: add pulseaudio to the input list
  avconv: remove unsubstantiated comment
  shorten: avoid abort() on unknown audio types
  cljr: add encoder
  build: merge lists of HTML documentation targets
  tests/examples: Mark some variables only used within their files as static.
  tests/tools/examples: Replace direct exit() calls by return.
  x86 cpuid: set vendor union members separately
  cljr: release picture at end of decoding
  rv40: NEON optimised rv40 qpel motion compensation

Conflicts:
doc/examples/muxing.c
libavcodec/cljr.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAPIchanges: add entry after av_buffersink_poll_frame() addition
Stefano Sabatini [Thu, 8 Dec 2011 21:55:33 +0000 (22:55 +0100)]
APIchanges: add entry after av_buffersink_poll_frame() addition

7 years agoMerge remote-tracking branch 'tjoppen/opatom_demuxing_and_seeking'
Michael Niedermayer [Thu, 8 Dec 2011 20:29:27 +0000 (21:29 +0100)]
Merge remote-tracking branch 'tjoppen/opatom_demuxing_and_seeking'

* tjoppen/opatom_demuxing_and_seeking:
  mxfdec: Index table driven demuxing and seeking
  mxfdec: Compute packet offsets properly
  mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack
  mxfdec: Parse more values in PartitionPack
  mxfdec: Parse TemporalOffsets
  mxfdec: av_dlog():ify 'no corresponding source package found'
  mxfdec: Compute essence container offsets and lengths into mxf->partitions
  mxfdec: Make mxf->partitions sorted by offset
  mxfdec: Parse ThisPartition
  mxfdec: Speed up metadata and index parsing
  mxfdec: Make sure DataDefinition is consistent between material track and source track
  mxfdec: Add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibnut: NULL priv->nut after nut_demuxer_uninit() as a saftey precaution.
Michael Niedermayer [Wed, 7 Dec 2011 22:35:57 +0000 (23:35 +0100)]
libnut: NULL priv->nut after nut_demuxer_uninit() as a saftey precaution.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibnut: Check nut_demuxer_init() return value.
Michael Niedermayer [Wed, 7 Dec 2011 22:35:21 +0000 (23:35 +0100)]
libnut: Check nut_demuxer_init() return value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibnut: check for av_malloc failure.
Michael Niedermayer [Mon, 28 Nov 2011 04:23:48 +0000 (05:23 +0100)]
libnut: check for av_malloc failure.

No, ive no testcase, i just spoted these when looking ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Use the buffer sinks poll instead of its input.
Michael Niedermayer [Tue, 6 Dec 2011 16:03:07 +0000 (17:03 +0100)]
ffmpeg: Use the buffer sinks poll instead of its input.
This fixes the case that the buffer sinks fifo contains frames which
would not show up on the poll from its input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuffersink: Implement a poll function.
Michael Niedermayer [Tue, 6 Dec 2011 16:02:15 +0000 (17:02 +0100)]
buffersink: Implement a poll function.
With this the application can find out how many frames are available.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: Index table driven demuxing and seeking
Tomas Härdin [Thu, 8 Dec 2011 19:28:49 +0000 (20:28 +0100)]
mxfdec: Index table driven demuxing and seeking

This adds OPAtom support and proper seeking.
D-10 and non-seekable OP1a streams still use the old demuxing/seeking code.

7 years agocljr: K&R cosmetics
Diego Biurrun [Thu, 8 Dec 2011 14:51:38 +0000 (15:51 +0100)]
cljr: K&R cosmetics

7 years agocljr: return a more sensible value when encountering invalid headers
Diego Biurrun [Thu, 8 Dec 2011 14:53:27 +0000 (15:53 +0100)]
cljr: return a more sensible value when encountering invalid headers

7 years agocljr: drop unnecessary emms_c() calls without MMX code
Diego Biurrun [Thu, 8 Dec 2011 14:38:49 +0000 (15:38 +0100)]
cljr: drop unnecessary emms_c() calls without MMX code

7 years agodocs: Minor project name cleanup
Michael Niedermayer [Thu, 8 Dec 2011 19:07:32 +0000 (20:07 +0100)]
docs: Minor project name cleanup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindevs.texi: fix application name to match the code
Michael Niedermayer [Thu, 8 Dec 2011 19:02:53 +0000 (20:02 +0100)]
indevs.texi: fix application name to match the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: more exact comment about libavformat.
Michael Niedermayer [Thu, 8 Dec 2011 18:34:53 +0000 (19:34 +0100)]
ffmpeg: more exact comment about libavformat.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: Compute packet offsets properly
Tomas Härdin [Thu, 8 Dec 2011 11:23:36 +0000 (12:23 +0100)]
mxfdec: Compute packet offsets properly

This replaces the old essence_offset code

7 years agomxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack
Tomas Härdin [Thu, 8 Dec 2011 10:53:57 +0000 (11:53 +0100)]
mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack

7 years agomxfdec: Parse more values in PartitionPack
Tomas Härdin [Thu, 8 Dec 2011 16:45:35 +0000 (17:45 +0100)]
mxfdec: Parse more values in PartitionPack

These values include KAGSize, HeaderByteCount and IndexByteCount.
The length of the pack itself is also stored, and KAGSize is sanity checked.
The FATE sample has KAGSize == 0, which is adjusted to 512.
Other bad KAGSizes are set to 1.

7 years agoFix typo: Correctly parse 64 byte umid tags in bext metadata.
Carl Eugen Hoyos [Thu, 8 Dec 2011 18:00:55 +0000 (19:00 +0100)]
Fix typo: Correctly parse 64 byte umid tags in bext metadata.