Michael Niedermayer
dcb0d1193a
Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'
...
* commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45':
atrac3: use AVCodecContext.channels instead of keeping a private copy
atrac3: simplify some loop indexing
atrac3: cosmetics: pretty-printing and renaming
pcm: define AVCodec instances only for enabled codecs
libxvid: remove useless doxy comments.
lavc: remove stats_out from the options table.
Conflicts:
libavcodec/atrac3.c
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 12:36:16 +02:00
Mans Rullgard
a1f6ad69c7
fate: check that dependencies actually exist
...
This causes make to exit with an error message if a nonexistent
dependency is specified rather than silently dropping the test.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-23 11:12:24 +01:00
Mans Rullgard
6f9018fc5e
fate: fix ENCMUX macro
...
This matches how it is actually being called.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-23 11:12:24 +01:00
Michael Niedermayer
ec444c84cf
mpegaudiodec: Fix buffer handling on random access
2012-10-23 10:52:25 +02:00
Diego Biurrun
2f17f265ed
mpegaudio: Refactor mp3on4 flush function
2012-10-23 10:52:25 +02:00
Diego Biurrun
88bdec03b9
fate: Add dependencies for audio tests
2012-10-23 10:52:25 +02:00
Diego Biurrun
71f3eb4536
fate: cosmetics: Group idct8x8 test together with all other libavcodec tests
2012-10-23 10:52:15 +02:00
Diego Biurrun
8b8899ac32
fate: Declare avcodec/avformat deps in the respective Makefile snippets
2012-10-23 10:28:40 +02:00
Diego Biurrun
7d420a4294
fate: More fine-grained dependencies for libavcodec test programs
2012-10-23 10:28:40 +02:00
Diego Biurrun
e273a1a542
fate: Add dependencies for WMA and WavPack tests
2012-10-23 10:28:40 +02:00
Diego Biurrun
8f4c414df6
Improve wording and spelling of av_log_missing_feature messages.
2012-10-23 10:28:40 +02:00
Anton Khirnov
c692957c4e
lavu: remove disabled avoptions cruft
2012-10-23 07:33:05 +02:00
Anton Khirnov
468ea9d5b1
Revert "avutil: make some tables visible again"
...
This reverts commit def8c94699
.
After the major bump this is no longer necessary.
2012-10-23 07:33:05 +02:00
Anton Khirnov
add3a6902e
lavu: bump major to 52
...
In addition to the recent tables mess, the AVOption defaults behavior
changed, so an old lavc used with a new lavu will get completely messed
up defaults.
2012-10-23 07:33:05 +02:00
Anton Khirnov
2b8dd371e4
lavu: postpone recent deprecations until the next major bump
2012-10-23 07:33:05 +02:00
Anton Khirnov
00ed7f5958
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
2012-10-23 07:33:05 +02:00
Anton Khirnov
8207c67a24
lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft
2012-10-23 07:33:05 +02:00
Anton Khirnov
c6b25d1d5e
Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility"
...
This reverts commit d15c21e5fa
.
After the major bump this is no longer necessary.
2012-10-23 07:33:05 +02:00
Anton Khirnov
9cac8a5199
APIchanges: update lavr bump date
2012-10-23 07:33:05 +02:00
Anton Khirnov
4e61a38aa0
avconv: only apply presets when we have an encoder.
...
Fixes a crash when using a preset with stream copy.
CC: libav-stable@libav.org
2012-10-23 07:30:58 +02:00
Michael Niedermayer
34ccb94796
g723_1: remove unneeded cliping
...
Fixes CID703731
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 03:03:59 +02:00
Michael Niedermayer
e9b61fffbe
g722dec: s/Libav/FFmpeg/ The copyright years predate the existence of Libav
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 03:03:53 +02:00
Michael Niedermayer
7770c0da07
fate/mapchan: add bitexact flag
...
fixes fate breakage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 02:19:38 +02:00
Paul B Mahol
a57d560db3
LVF demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-22 23:22:39 +00:00
Michael Niedermayer
3318d6b940
ffmpeg: check avpicture_get_size() retuen value
...
Fixes CID205018
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 00:22:23 +02:00
Michael Niedermayer
da317efd92
j2k: reorder multiplications to avoid interger overflows related to precincts
...
Fixes CID703778, CID703777
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 00:03:49 +02:00
Michael Niedermayer
45ae9a8fc9
j2k: reorder multiplications to avoid interger overflows related to code blocks
...
Fixes CID703776, CID703775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 00:03:49 +02:00
Clément Bœsch
7c2d5eec29
fate: quote file paths in movie/amovie filtergraphs.
...
This should avoid some nasty ':' escaping.
2012-10-22 23:13:54 +02:00
Clément Bœsch
2649b78384
fate: improve metadata filter deps readability.
2012-10-22 23:13:53 +02:00
Clément Bœsch
ae69c683e5
fate: add scale filter to the scene detect dependencies.
...
The select filter requires some conversion to rgb24 for the scene
detection.
2012-10-22 23:13:53 +02:00
Clément Bœsch
7be9c0c10f
fate: fix SAMPLES dependency for ffprobe.
...
FATE_SAMPLES_FFPROBE is a different list than FATE_FFPROBE, the same way
FATE_SAMPLES_FFMPEG is a different list than FATE_FFMPEG; these
FATE_SAMPLES_<tool> lists are in the FATE_EXTERN list, which is only
used when SAMPLES is set.
2012-10-22 23:13:53 +02:00
Michael Niedermayer
0de41ead6f
qt-faststart: check fseeko() return codes
...
Fixes CID733725
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22 22:42:51 +02:00
Michael Niedermayer
250fe6eeb4
cmdutils: apply option to codec and format contexts if possible.
...
This is needed for setting both contexts -err_detect at once.
Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22 22:24:23 +02:00
Matthieu Bouron
c68a8a1340
lavf/aiffdec: don't stop parsing after SSND chunk
...
Some file has ID3 chunk placed after SSND.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22 19:38:27 +02:00
Matthieu Bouron
d8173f264f
dv: fix a check on dv_extract_timecode return value
...
Fixes CID733808
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22 19:09:47 +02:00
Michael Niedermayer
22793d7bb3
ffmpeg/lavc: move experimental warnings to libavcodec.
...
This way they are available to all applications and not just ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22 17:58:33 +02:00
Justin Ruggles
5d1007f74d
atrac3: initialize static tables in AVCodec.init_static_data()
2012-10-22 10:10:08 -04:00
Justin Ruggles
a1f4cd371a
atrac3: replace a calculation with FFALIGN()
...
This allocates 4 bytes less than the previous code if avctx->block_align is
a multiple of 4, but the extra 4 bytes is not really needed.
2012-10-22 10:10:08 -04:00
Justin Ruggles
78edce3f19
atrac3: separate window initialization from IMDCT initialization
2012-10-22 10:10:08 -04:00
Justin Ruggles
808686fc1e
atrac3: remove unused ATRAC3Context field, sample_rate
2012-10-22 10:10:08 -04:00
Justin Ruggles
c51311b907
atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
2012-10-22 10:10:08 -04:00
Justin Ruggles
89a6c32bc1
atrac3: use sizeof(variable) instead of sizeof(type)
2012-10-22 10:10:08 -04:00
Justin Ruggles
327747de15
atrac3: simplify MDCT window calculation
2012-10-22 10:10:08 -04:00
Justin Ruggles
a2664c91fb
atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
2012-10-22 10:10:07 -04:00
Justin Ruggles
7e76f27081
atrac3: remove unused ATRAC3Context field, bit_rate
2012-10-22 10:10:07 -04:00
Justin Ruggles
7c1f93afe6
atrac3: remove unused ATRAC3Context field, samples_per_channel
2012-10-22 10:10:07 -04:00
Justin Ruggles
cdd0e0de81
atrac3: use AVCodecContext.block_align instead of keeping a private copy
2012-10-22 10:10:07 -04:00
Justin Ruggles
64ebbb8f89
atrac3: move the 'delay' field from ATRAC3Context to where it is used
2012-10-22 10:10:07 -04:00
Justin Ruggles
5ac673b553
atrac3: use AVCodecContext.channels instead of keeping a private copy
2012-10-22 10:10:06 -04:00
Justin Ruggles
56a9d2b44e
atrac3: move the 'version' field from ATRAC3Context to where it is used
2012-10-22 10:10:06 -04:00