OSDN Git Service
Michael Niedermayer [Wed, 23 Mar 2011 01:42:56 +0000 (02:42 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master: (33 commits)
Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
Add kbdwin.o to AC3 decoder
Detect byte-swapped AC-3 and support decoding it directly.
cosmetics: indentation
Always copy input data for AC3 decoder.
ac3enc: make sym_quant() branch-free
cosmetics: indentation
Add a CPU flag for the Atom processor.
id3v2: skip broken tags with invalid size
id3v2: don't explicitly skip padding
Make sure kbhit() is in conio.h
fate: update wmv8-drm reference
vc1: make P-frame deblock filter bit-exact.
configure: Add the -D parameter to the dlltool command
amr: Set the AVFMT_GENERIC_INDEX flag
amr: Set the pkt->pos field properly to the start of the packet
amr: Set the codec->bit_rate field based on the last packet
rtsp: Specify unicast for TCP interleaved streams, too
Set the correct target for mingw64 dlltool
applehttp: Change the variable for stream position in seconds into int64_t
...
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/ac3dec.c
libavformat/avio.h
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vitor Sessak [Sun, 20 Mar 2011 17:30:29 +0000 (18:30 +0100)]
Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Kieran Kunhya [Tue, 22 Mar 2011 22:17:41 +0000 (22:17 +0000)]
Add kbdwin.o to AC3 decoder
Fixes --disable-everything --enable-decoder=ac3
Signed-off-by: Mans Rullgard <mans@mansr.com>
Carl Eugen Hoyos [Tue, 22 Mar 2011 21:38:44 +0000 (22:38 +0100)]
Do not use format string "%0.3f" for RTSP Range field.
Fixes ticket 10.
The format string was locale-depending.
Michael Niedermayer [Tue, 22 Mar 2011 21:36:57 +0000 (22:36 +0100)]
Fake-Merge remote-tracking branch 'ffmpeg-mt/master'
Reimar Döffinger [Tue, 22 Mar 2011 18:22:07 +0000 (14:22 -0400)]
Detect byte-swapped AC-3 and support decoding it directly.
This allows the AC-3 decoder to be used directly with RealMedia
decoders that unlike the libavformat one do not byte-swap automatically.
Since the new code is only used in case we would fail directly otherwise
there should be no risk for regressions.
Justin Ruggles [Tue, 22 Mar 2011 18:14:41 +0000 (14:14 -0400)]
cosmetics: indentation
Justin Ruggles [Tue, 22 Mar 2011 18:11:34 +0000 (14:11 -0400)]
Always copy input data for AC3 decoder.
Depending on error_recognition is not correct, low values do
certainly not mean it is ok to crash.
Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Justin Ruggles [Tue, 22 Mar 2011 18:36:18 +0000 (14:36 -0400)]
ac3enc: make sym_quant() branch-free
Justin Ruggles [Tue, 22 Mar 2011 03:33:00 +0000 (23:33 -0400)]
cosmetics: indentation
Justin Ruggles [Tue, 22 Mar 2011 03:32:40 +0000 (23:32 -0400)]
Add a CPU flag for the Atom processor.
The Atom has SSSE3 support, which is useful in many cases, but sometimes the
SSSE3 version is slower than the SSE2 equivalent on the Atom, but is generally
faster on other processors supporting SSSE3. This flag allows for selectively
disabling certain SSSE3 functions on the Atom.
Anton Khirnov [Tue, 22 Mar 2011 09:35:35 +0000 (10:35 +0100)]
id3v2: skip broken tags with invalid size
fixes issue2649.
Anton Khirnov [Tue, 22 Mar 2011 09:35:34 +0000 (10:35 +0100)]
id3v2: don't explicitly skip padding
It's pointless, since there's a seek to the end of tag later.
Dave Yeo [Tue, 22 Mar 2011 03:47:48 +0000 (03:47 +0000)]
Make sure kbhit() is in conio.h
Conio.h is a non-standard header and may not have kbhit()
prototyped. This fixes compile on OS/2 where the EMX version (we're
using a fork) of conio.h only has getch() and getche().
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 22 Mar 2011 02:49:37 +0000 (02:49 +0000)]
fate: update wmv8-drm reference
This updates the wmv8-drm reference after
c47d383.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Ronald S. Bultje [Tue, 22 Mar 2011 01:26:26 +0000 (21:26 -0400)]
vc1: make P-frame deblock filter bit-exact.
Martin Storsjö [Mon, 21 Mar 2011 20:41:38 +0000 (22:41 +0200)]
configure: Add the -D parameter to the dlltool command
This is required for the generated .lib file to actually
be usable by MSVC.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Wed, 9 Feb 2011 10:19:39 +0000 (12:19 +0200)]
amr: Set the AVFMT_GENERIC_INDEX flag
This makes the amr demuxer support seeking, closing roundup
issue 2593.
Martin Storsjö [Wed, 9 Feb 2011 10:16:51 +0000 (12:16 +0200)]
amr: Set the pkt->pos field properly to the start of the packet
Previously, the field pointed to the second byte of the packet
(which is the first byte of the actual AMR payload).
Martin Storsjö [Wed, 9 Feb 2011 10:13:32 +0000 (12:13 +0200)]
amr: Set the codec->bit_rate field based on the last packet
This allows libavformat to guess an estimated duration for
amr files.
For streams with varying bit rates (or with silence descriptors
or "no frame" blocks) the guess is, of course, inaccurate.
Martin Storsjö [Mon, 21 Mar 2011 12:19:09 +0000 (14:19 +0200)]
rtsp: Specify unicast for TCP interleaved streams, too
According to the RFC, the default is multicast if nothing is
specified, which doesn't make sense for TCP.
According to a bug report, some Axis camera models give a
"400 Bad Request" error if this is omitted.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 21 Mar 2011 19:22:51 +0000 (20:22 +0100)]
Set the correct target for mingw64 dlltool
That fixes .lib creation for the win64 target.
Martin Storsjö [Mon, 21 Mar 2011 10:20:18 +0000 (12:20 +0200)]
applehttp: Change the variable for stream position in seconds into int64_t
A similar variable for the total stream duration was changed to
int64_t in
b79c3df08807c96a945, due to overflows in some odd
streams.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Mon, 21 Mar 2011 13:52:54 +0000 (15:52 +0200)]
ffplay: Don't assume ic->pb is non-null
This fixes crashes on exit when plaing some RealRTSP streams
(among other), e.g.
rtsp://dl.lib.brown.edu:554/areserves/
1093545294660883.mp3.
These crashes have been present since
3e68b3ba7b015cf21.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Tue, 15 Mar 2011 06:54:22 +0000 (07:54 +0100)]
id3v2: simplify error handling.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Thu, 17 Mar 2011 06:10:23 +0000 (07:10 +0100)]
id3v2: explicitly seek to the end of the tag after reading
Current code might stop in the middle of an invalid tag.
fixes issue2650
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 14 Mar 2011 19:38:59 +0000 (20:38 +0100)]
avio: make av_url_read_fseek/fpause internal.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Stefano Sabatini [Sun, 13 Mar 2011 20:22:59 +0000 (21:22 +0100)]
ffprobe: tweak error message in open_input_file()
Replace "codec (id=%d)" with "codec with id %d", slightly more
readable.
Ronald S. Bultje [Mon, 21 Mar 2011 14:00:43 +0000 (10:00 -0400)]
vc1: slice support.
Also reset coded_block at each new slice, fixes problems in slice playback.
Ronald S. Bultje [Tue, 1 Mar 2011 16:37:55 +0000 (11:37 -0500)]
vc1: fix up memleaks in the error codepath.
Introduce end: and err: labels at the end of vc1_decode_frame(), which
will clean up allocated memory consistently.
Ronald S. Bultje [Tue, 1 Mar 2011 16:37:55 +0000 (11:37 -0500)]
vc1: warn for unimplemented pan-scan feature.
Peter Ross [Sun, 20 Mar 2011 02:19:51 +0000 (13:19 +1100)]
Remove unused pixel format (PIX_FMT_UNUSED) and swap PIX_FMT_BGR48LE and PIX_FMT_BGR48BE enum order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Mon, 21 Mar 2011 11:06:56 +0000 (12:06 +0100)]
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
Carl Eugen Hoyos [Mon, 21 Mar 2011 11:04:10 +0000 (12:04 +0100)]
Allow demuxing of APE files with metadata tags.
Fixes ticket 11.
Michael Niedermayer [Mon, 21 Mar 2011 02:09:46 +0000 (03:09 +0100)]
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 17 Mar 2011 13:03:31 +0000 (14:03 +0100)]
avio: deprecate url_fileno
It's an evil hack that assumes an AVIOContext is always based on top of
an URLContext.
It's also not used anywhere.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Thu, 17 Mar 2011 06:41:19 +0000 (07:41 +0100)]
rmenc: replace avio_seek(0) with avio_tell()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Thu, 17 Mar 2011 06:35:18 +0000 (07:35 +0100)]
lavf: replace some more avio_seek(SEEK_CUR) with avio_skip
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Mans Rullgard [Sun, 20 Mar 2011 22:04:47 +0000 (22:04 +0000)]
ffv1: allocate correct size for sample buffer
This fixes a typo in the size calculation for the sample buffer
introduced in
cbabccc367424.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Panagiotis H.M. Issaris [Thu, 10 Mar 2011 15:07:52 +0000 (16:07 +0100)]
Do no modify terminal parameters using termios.h
Remove usage of tcgetattr and tcsetattr to modify terminal
parameters, and rely on ctrl-c to stop instead of pressing 'q'.
On systems with conio.h, keep the old behavior.
Changing the terminal settings causes problems if multiple instances
are running asynchronously on the same terminal, such as during a
parallel FATE run, or if the process crashes before restoring the
terminal. In both cases, the terminal state is messed up requiring
a manual reset.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 20 Mar 2011 19:49:10 +0000 (19:49 +0000)]
Move ff_dct_init_mmx declaration to dct.h
This was missed in
0aded94.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mike Scheutzow [Sun, 20 Mar 2011 07:01:41 +0000 (08:01 +0100)]
doc: add details to the documentation for ffmpeg -map
Patch by Mike Sheutzow with some additions and changes by Stefano.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stefano Sabatini [Sun, 20 Mar 2011 07:01:40 +0000 (08:01 +0100)]
ffmpeg: modify help text for the map option
Change "file:stream[:syncfile:syncstream]" to
"file.stream[:syncfile.syncstream]", the latter syntax is more
consistent with the stream identifier form printed by
av_dump_format(), and more readable. Both syntaxes are currently
accepted by the opt_map() code.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Mans Rullgard [Sun, 20 Mar 2011 02:14:52 +0000 (02:14 +0000)]
dct: remove superflous #include
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 20 Mar 2011 02:14:25 +0000 (02:14 +0000)]
Move dct and rdft definitions to separate files
This leaves fft.h with only the core FFT and MDCT definitions
thus making it more managable.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 19 Mar 2011 23:44:00 +0000 (23:44 +0000)]
Move sine windows to a separate file
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 19 Mar 2011 17:19:04 +0000 (17:19 +0000)]
Move ff_kbd_window_init() to a separate file
This function is not tightly coupled to mdct, and it's in the way
of making a fixed-point mdct implementation.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 19 Mar 2011 15:14:17 +0000 (15:14 +0000)]
fft: remove inline wrappers for function pointers
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 6 Mar 2011 13:50:21 +0000 (13:50 +0000)]
configure: use pkg-config helpers
This makes existing pkg-config uses as well as the libsdl checks
use the new pkg-config helper functions, which should be more
robust against broken systems.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 6 Mar 2011 13:48:30 +0000 (13:48 +0000)]
configure: improve pkg-config support
This adds helper functions for checking packages with pkg-config
and managing the associated flags.
Note that pkg-config use is still discouraged due to widespread
poor practices resulting in broken flags in many situations. A
few badly designed packages require flags only obtainable using
pkg-config, and these functions are intended for those cases.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3f8040db3e13c3dbdf07c74d92ca34817a69f733)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Mon, 7 Mar 2011 02:49:55 +0000 (02:49 +0000)]
configure: allow checking multiple functions in check_func_headers()
This makes it possible to pass a space-separated list of functions
to check_func_headers and check_lib2. If any function is missing,
none are enabled as available, so this should only be used for
all-or-nothing sets, i.e. groups in which none will be used if any
one is missing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Mar 2011 19:02:42 +0000 (20:02 +0100)]
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
commit
42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
Author: Mans Rullgard <mans@mansr.com>
Date: Mon Feb 28 18:06:58 2011 +0000
Remove Sonic experimental audio codec
commit
2912e87a6c9264d556734e2bf94a99c64cf9b102
Author: Mans Rullgard <mans@mansr.com>
Date: Fri Mar 18 17:35:10 2011 +0000
Replace FFmpeg with Libav in licence headers
Peter Ross [Sat, 19 Mar 2011 04:24:09 +0000 (15:24 +1100)]
Add unused pixel format (PIX_FMT_UNUSED) to make PIX_FMT_BGR48BE an odd-valued enumeration
This is required for the isBE() macro internal to libswscale.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 19 Mar 2011 14:42:37 +0000 (15:42 +0100)]
ffplay: add braces around union definition
Fix warning:
ffplay.c: At top level:
ffplay.c:3027: warning: missing braces around initializer
ffplay.c:3027: warning: (near initialization for ‘options[53].u’)
Stefano Sabatini [Sat, 19 Mar 2011 14:35:30 +0000 (15:35 +0100)]
ffplay: add existence check on ic->pb in decode_thread()
Fix crash if ic->pb is NULL and ic->pb->error is evaluated. This
happens for example with: ffplay photo.jpeg.
Luca Barbato [Thu, 17 Mar 2011 01:54:12 +0000 (02:54 +0100)]
configure: use dlltools instead of lib.exe
This way building ffmpeg on mingw won't require windows specific tools
Luca Barbato [Sat, 19 Mar 2011 14:45:48 +0000 (15:45 +0100)]
configure: check for SDL_Linked_Version instead of SDL_Init
This avoids the main/SDL_main declaration clash caused by SDL on
Windows and other platforms.
Mans Rullgard [Mon, 28 Feb 2011 18:06:58 +0000 (18:06 +0000)]
Remove Sonic experimental audio codec
Since initially committed in 2004, this codec has only been touched
for maintenanance. Functionally, it contains no novel ideas and
its intended audience is better served by existing mature codecs.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 17 Mar 2011 17:05:11 +0000 (17:05 +0000)]
fate: remove stale fate-update.sh script
This script was used to import Mike's old fate database and
is no longer needed.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Fri, 18 Mar 2011 17:35:10 +0000 (17:35 +0000)]
Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reimar Döffinger [Sat, 19 Mar 2011 11:29:07 +0000 (12:29 +0100)]
Fix compiler warnings due to missing casts.
Reimar Döffinger [Sat, 5 Mar 2011 12:49:13 +0000 (13:49 +0100)]
Detect byte-swapped AC-3 (aka DNET) and support decoding it directly.
This allows the AC-3 decoder to be used directly with RealMedia
decoders that unlike the libavformat one do not byte-swap automatically.
Since the new code is only used in case we would fail directly otherwise
there should be no risk for regressions.
The "buf" pointer needs to be overwritten since otherwise the CRC check fails.
Mark Himsley [Fri, 18 Mar 2011 15:25:26 +0000 (15:25 +0000)]
fade: fix draw_slice() check on fade->factor value
draw_slice() checks that the fade factor is < 65536 and only
calculates the fade if so. But the fade factor is clipped in
end_frame() by av_clip_uint16() to 65535, so the fade is calculated
for every frame. This patch alters the check so that it compares with
< 65535 (UINT16_MAX).
Mark Himsley [Fri, 18 Mar 2011 14:42:29 +0000 (14:42 +0000)]
fade: make draw_slice() chroma check against planes 1 and 2
draw_slice() checks that planes 0 and 1 of AVFilterBufferRef's data
are not NULL before manipulating planes 1 and 2. This patch makes the
check against planes 1 and 2. More senseful and possibly more robust.
Janne Grunau [Wed, 16 Mar 2011 20:53:58 +0000 (21:53 +0100)]
get rid of the last svn mentions
Peter Ross [Fri, 18 Mar 2011 11:28:52 +0000 (22:28 +1100)]
patcheck: warn about assert usage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 Mar 2011 12:16:14 +0000 (13:16 +0100)]
reverts parts of commit
de11ee906ed232157392924735c18ab7d8522ccb. The author of this patch has a poor understanding of the code
Michael Niedermayer [Fri, 18 Mar 2011 16:58:49 +0000 (17:58 +0100)]
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 17 Mar 2011 11:52:40 +0000 (12:52 +0100)]
lavf: fix function name in compute_pkt_fields2 av_dlog message
Konstantin Pavlov [Thu, 17 Mar 2011 10:11:14 +0000 (10:11 +0000)]
configure: use -r option for pr when listing enabled config options.
This fixes ugliness when configure outputs its (empty) results on HPUX
(maybe some other UNIXes too):
Enabled indevs:
pr: -- empty file
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nathan Caldwell [Fri, 18 Mar 2011 01:33:05 +0000 (19:33 -0600)]
aacenc: 10l, missed a reference when refactoring the psymodel.
Justin Ruggles [Wed, 16 Mar 2011 02:29:04 +0000 (22:29 -0400)]
ac3enc: add float_to_fixed24() with x86-optimized versions to AC3DSPContext
and use in scale_coefficients() for the floating-point AC-3 encoder.
Mans Rullgard [Thu, 17 Mar 2011 19:43:57 +0000 (19:43 +0000)]
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>
j@v2v.cc [Thu, 17 Mar 2011 16:57:52 +0000 (17:57 +0100)]
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>
Michael Niedermayer [Thu, 17 Mar 2011 16:02:54 +0000 (17:02 +0100)]
Revert "jvdec: don't use deprecated url_feof()"
This reverts commit
1dac4d554734b16757b36a0adc71642c5ef2c4e6.
Michael Niedermayer [Thu, 17 Mar 2011 16:02:14 +0000 (17:02 +0100)]
Revert "partially rename FFmpeg to Libav"
This reverts commit
070c5d0f3530c16c92b81f3f0de2943410367c00.
Michael Niedermayer [Thu, 17 Mar 2011 16:01:10 +0000 (17:01 +0100)]
Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
This reverts commit
29ba091136a5e04574f7bfc1b17536c923958f6f.
Michael Niedermayer [Thu, 17 Mar 2011 15:57:37 +0000 (16:57 +0100)]
Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
This reverts commit
a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
Michael Niedermayer [Thu, 17 Mar 2011 15:55:58 +0000 (16:55 +0100)]
Revert "replace FFmpeg with Libav in doc/"
This reverts commit
f8a45fa1b1764b34d4263eacd93411e8ba0484a4.
Conflicts:
doc/optimization.txt
Anton Khirnov [Thu, 17 Mar 2011 16:00:21 +0000 (17:00 +0100)]
nutenc: fix a memleak
This fixes a minor memory leak introduced in
073f8b1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Vladimir Pantelic [Thu, 17 Mar 2011 13:56:14 +0000 (14:56 +0100)]
asfdec: subtract the preroll value and thus output 0 based timestamps
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 17 Mar 2011 15:53:58 +0000 (16:53 +0100)]
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 17 Mar 2011 10:15:57 +0000 (21:15 +1100)]
Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Tue, 15 Mar 2011 05:14:23 +0000 (22:14 -0700)]
CrystalHD: Use doxygen compatible comments where relevant.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 17 Mar 2011 10:24:23 +0000 (12:24 +0200)]
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>
Martin Storsjö [Thu, 17 Mar 2011 10:23:52 +0000 (12:23 +0200)]
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>
Martin Storsjö [Thu, 17 Mar 2011 10:24:08 +0000 (10:24 +0000)]
applehttp: Fix a typo in a comment
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Tue, 15 Mar 2011 12:03:03 +0000 (13:03 +0100)]
lavf: make av_interleave_packet() return meaningful error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
c5dcb3d493a6bb73efeb8bfae24f5cc31908201f)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Stefano Sabatini [Tue, 15 Mar 2011 12:12:15 +0000 (13:12 +0100)]
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
d541c8b468c12892fe7b7e655e1ed45e11e2166d)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Stefano Sabatini [Tue, 15 Mar 2011 12:11:57 +0000 (13:11 +0100)]
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
77f21ce4641b53f3277ba30ca3d009b6250fd9ea)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Nathan Caldwell [Thu, 17 Mar 2011 03:35:39 +0000 (23:35 -0400)]
aacenc: cosmetics, indentation, and comment clarification
Correct bad indentation in aaccoder
Clarify and correct comments in 3GPP psymodel, other cosmetics.
Nathan Caldwell [Thu, 17 Mar 2011 03:34:12 +0000 (23:34 -0400)]
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.
Young Han Lee [Fri, 11 Mar 2011 02:39:24 +0000 (11:39 +0900)]
aaccoder: Change FFMAX for allzero flag to OR bit operation
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 14 Mar 2011 19:39:06 +0000 (20:39 +0100)]
avio: rename put_flush_packet -> avio_flush
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 14 Mar 2011 19:39:05 +0000 (20:39 +0100)]
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>
Anton Khirnov [Mon, 14 Mar 2011 19:39:04 +0000 (20:39 +0100)]
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>
Anton Khirnov [Mon, 14 Mar 2011 19:39:03 +0000 (20:39 +0100)]
avio: always compile avio_printf, rather than on CONFIG_MUXERS
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 14 Mar 2011 19:39:02 +0000 (20:39 +0100)]
avio: avio_ prefix for url_fprintf
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 14 Mar 2011 19:39:01 +0000 (20:39 +0100)]
avio: change avio_tell/skip from macros to inline functions
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 14 Mar 2011 19:38:58 +0000 (20:38 +0100)]
avio: make url_setbufsize internal.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>