Michael Niedermayer
4eb41d16be
Merge remote-tracking branch 'newdev/master'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-18 17:58:58 +01:00
Stefano Sabatini
12bcfe05b4
lavf: fix function name in compute_pkt_fields2 av_dlog message
2011-03-18 17:21:48 +01:00
Nathan Caldwell
350785a662
aacenc: 10l, missed a reference when refactoring the psymodel.
2011-03-17 21:01:08 -07:00
Justin Ruggles
0f999cfddb
ac3enc: add float_to_fixed24() with x86-optimized versions to AC3DSPContext
...
and use in scale_coefficients() for the floating-point AC-3 encoder.
2011-03-17 16:46:48 -04:00
Mans Rullgard
487fef2dcc
asf: update seek test reference
...
This updates the seek test reference to match de11ee9
. Before this
change, most of the seeks requested positions before the supposed
start of the file (the preroll time), resulting in the first packet
being returned. With the preroll subtracted, some of these seeks
will land within the file and some beyond the end, thus returning
a different set of packets.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 19:51:28 +00:00
j@v2v.cc
3660b5bca9
remove definition of swab
...
right now swab is defined in libavfilter/libmpcodecs/mpbswap.h
this breaks mingw32 cross compiles. since it its not used, it should be
removed. alternatively swab has to be added to HAVE_LIST in configure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 19:09:45 +01:00
Michael Niedermayer
afbfb2a81d
Revert "jvdec: don't use deprecated url_feof()"
...
This reverts commit 1dac4d5547
.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
c0b1bc8d17
Revert "partially rename FFmpeg to Libav"
...
This reverts commit 070c5d0f35
.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
e528cdac8a
Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
...
This reverts commit 29ba091136
.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0cb88628fb
Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
...
This reverts commit a03be6e1ba
.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
a6be21d3ba
Revert "replace FFmpeg with Libav in doc/"
...
This reverts commit f8a45fa1b1
.
Conflicts:
doc/optimization.txt
2011-03-17 17:26:45 +01:00
Anton Khirnov
2cface71ca
nutenc: fix a memleak
...
This fixes a minor memory leak introduced in 073f8b1
.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 16:25:54 +00:00
Vladimir Pantelic
de11ee906e
asfdec: subtract the preroll value and thus output 0 based timestamps
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 16:25:54 +00:00
Michael Niedermayer
0fecf2642b
Merge remote-tracking branch 'newdev/master'
...
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00
Peter Ross
e309fdc701
Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 15:11:31 +01:00
Philip Langdale
969eb21ba2
CrystalHD: Use doxygen compatible comments where relevant.
...
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 13:02:23 +01:00
Martin Storsjö
f1f60f5252
lavf: Make make_absolute_url a lavf internal function
...
This is shared by both applehttp demuxer and protocol.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-17 12:28:37 +01:00
Martin Storsjö
dc6fdad5dc
Add missed APIchanges and changelog entries
...
Add an APIchanges entry for the av_pkt_dump2 and av_pkt_dump_log2
functions, and a changelog entry for the apple http live streaming
protocol handler.
Since neither of them got a minor bump at commit time, but were
applied before the jv demuxer, they all can be considered added
in this minor version.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-17 12:28:37 +01:00
Martin Storsjö
bc040cb3e2
applehttp: Fix a typo in a comment
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 11:20:21 +00:00
Stefano Sabatini
68d875addc
lavf: make av_interleave_packet() return meaningful error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c5dcb3d493
)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-17 07:30:09 +01:00
Stefano Sabatini
70abc32314
lavf: enable av_dlog message in av_interleaved_write_frame()
...
Help debugging timestamp issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d541c8b468
)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-17 07:29:57 +01:00
Stefano Sabatini
79f43a8cb6
lavf: enable av_dlog() in compute_pkt_fields2()
...
Turns a comment into an av_dlog() instruction, also add a commented
issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 77f21ce464
)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-17 07:29:47 +01:00
Nathan Caldwell
4afedfd8e5
aacenc: cosmetics, indentation, and comment clarification
...
Correct bad indentation in aaccoder
Clarify and correct comments in 3GPP psymodel, other cosmetics.
2011-03-16 23:35:39 -04:00
Nathan Caldwell
b7c96769c5
aacenc: Refactor the parts of the AAC psymodel.
...
3GPP:
Remove ffac from and move min_snr out of AacPsyBand.
Rearrange AacPsyCoeffs to make it easier to implement energy spreading.
Rename the band[] array to bands[]
Copy energies and thresholds at the end of analysis.
LAME:
Use a loop instead of an if chain in LAME windowing.
2011-03-16 23:34:12 -04:00
Young Han Lee
f578854efc
aaccoder: Change FFMAX for allzero flag to OR bit operation
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 23:12:43 -04:00
Anton Khirnov
b7f2fdde74
avio: rename put_flush_packet -> avio_flush
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
Anton Khirnov
35f1023592
avio: deprecate url_close_buf
...
It's not used anywhere and its return value looks broken.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
Anton Khirnov
83fddaeb81
avio: deprecate url_open_buf
...
It's only used in one place and does the same thing as
avio_alloc_context.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
Anton Khirnov
eda4cf92d7
avio: always compile avio_printf, rather than on CONFIG_MUXERS
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
Anton Khirnov
d9d86e00b2
avio: avio_ prefix for url_fprintf
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
Anton Khirnov
af02073225
avio: change avio_tell/skip from macros to inline functions
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
Anton Khirnov
59f65d9579
avio: make url_setbufsize internal.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:38 -04:00
Anton Khirnov
4839c192de
lavf: move ff_get_v from avio.h to avio_internal.h
...
And rename it to ffio_read_varlen.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:38 -04:00
Anton Khirnov
073f8b10d8
nutenc: mux chapters.
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-17 03:34:16 +01:00
Luca Barbato
4af9c1a56f
doc: update applehttp documentation
...
Integrate more comments from Stefano.
2011-03-17 03:34:16 +01:00
Anton Khirnov
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:24:51 -04:00
Stefano Sabatini
c5dcb3d493
lavf: make av_interleave_packet() return meaningful error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 01:35:08 +01:00
Stefano Sabatini
77f21ce464
lavf: enable av_dlog() in compute_pkt_fields2()
...
Turns a comment into an av_dlog() instruction, also add a commented
issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 01:35:08 +01:00
Stefano Sabatini
d541c8b468
lavf: enable av_dlog message in av_interleaved_write_frame()
...
Help debugging timestamp issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 01:35:08 +01:00
Thierry Foucu
a7844c580d
Fix compilation error when CONFIG_AVFILTER is not defined.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 01:35:08 +01:00
Ramiro Polla
cbf5d22d24
Remove occurrences of my old email address
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-16 23:19:40 +00:00
Mans Rullgard
381d37fda9
dsputil: add bswap16_buf()
...
There are several places where a buffer is byte-swapped in 16-bit units.
This allows them to share code which can be optimised for various
architectures.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-16 23:19:40 +00:00
Sean McGovern
dff68563d8
darwin: use -read_only_relocs flag only on 32-bit x86
...
Avoids the linker warning:
ld: warning: -read_only_relocs cannot be used with x86_64
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-16 23:18:27 +00:00
Aurelien Jacobs
6f1260f870
matroskadec: set a default duration also for packets comming from a simple block
2011-03-16 23:37:16 +01:00
Baptiste Coudurier
69aab68037
Use av_strdup instead of strdup, fixes mingw build
2011-03-16 14:26:25 -07:00
Janne Grunau
f8a45fa1b1
replace FFmpeg with Libav in doc/
...
unless it stands for ffmpeg the program or is historic
2011-03-16 22:01:01 +01:00
Janne Grunau
a03be6e1ba
use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*
2011-03-16 21:54:39 +01:00
Janne Grunau
29ba091136
replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
...
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01:00
Janne Grunau
070c5d0f35
partially rename FFmpeg to Libav
...
update mailing list references and irc channels in configure
2011-03-16 21:54:39 +01:00
Ramiro Polla
57149a92f8
Remove occurrences of my old email address.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-16 20:07:38 +01:00