bd77a5e27c
APIchanges: add entry for av_force_cpu_flags() addition
2011-06-10 12:13:08 +02:00
ace0a5e236
lavf: bump minor after the addition of fps_probe_size to AVFormatContext
2011-06-10 12:13:08 +02:00
62519c6139
lavc: bump minor after the addition of AVCodecContext.request_sample_fmt
2011-06-10 12:13:08 +02:00
7b8ec38d28
ac3: there was no libav in 2010 thus this code cannot be from libav.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-10 04:54:30 +02:00
2ec77aae67
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavf: make compute_pkt_fields2() return meaningful error values
matroskadec: set timestamps for RealAudio packets.
intelh263dec: aspect ratio processing fix.
intelh263dec: fix "Strict H.263 compliance" file playback
oss,sndio: simplify by using FFMIN.
swscale: extract monowhite/black output from yuv2packed[12X]_c().
swscale: de-macro'ify RGB15/16/32 input functions.
swscale: rearrange code.
movdec: Add support for the 'wfex' atom.
ffmpeg.c: Add a necessary const qualifier
riff: Fix potential memleak.
swscale: change 48bit RGB input macros to inline functions.
swscale: change 9/10bit YUV input macros to inline functions.
swscale: extract gray16 output functions from yuv2packed[12X]().
swscale: use standard clipping functions.
swscale: merge macros that are used only once.
swscale: fix function declarations in swscale.c.
swscale: fix function declaration keywords in x86/swscale_template.c.
Conflicts:
ffmpeg.c
libavcodec/intelh263dec.c
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-10 04:47:23 +02:00
6a137dde3e
dict: This code was developed in ffmpeg and not libav, nor by libav developers.
...
Correct copyright notices.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-10 00:19:25 +02:00
996bbdbf1f
lavf: make compute_pkt_fields2() return meaningful error values
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-09 23:00:11 +02:00
4654420410
matroskadec: set timestamps for RealAudio packets.
...
Improves seeking in ffplay with
http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-09 22:53:17 +02:00
8e84c072e4
intelh263dec: aspect ratio processing fix.
...
patch submitted by xvid_fan freenet de
2011-06-09 22:53:17 +02:00
95a05030ca
intelh263dec: fix "Strict H.263 compliance" file playback
...
fixes issue2449
patch submitted by xvid_fan freenet de
2011-06-09 22:53:17 +02:00
c673c90515
oss,sndio: simplify by using FFMIN.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-09 22:53:17 +02:00
6b105e3ee6
swscale: extract monowhite/black output from yuv2packed[12X]_c().
...
This is part of the Great Evil Plan to simplify swscale.
2011-06-09 16:47:45 -04:00
6d4d483eee
swscale: de-macro'ify RGB15/16/32 input functions.
...
Inline functions are easier to read, maintain, modify and test,
which justifies the slightly increased source size. This patch
also adds support for non-native endianness RGB15/16 and fixes
isSupportedOutput() to no longer claim that we support writing
non-native RGB565/555/444.
2011-06-09 16:47:45 -04:00
e2babb9b47
swscale: rearrange code.
...
This way the code in the file is less cluttered all-over-the-
place.
2011-06-09 16:47:45 -04:00
85e9e3a9fa
movdec: Add support for the 'wfex' atom.
...
The 'wfex' is just a Microsoft WaveFormatEx struct.
2011-06-09 10:14:32 -07:00
9a1b79128c
ffmpeg.c: Add a necessary const qualifier
2011-06-09 10:12:50 -07:00
ed8a50068c
riff: Fix potential memleak.
...
Make ff_get_wav_header() free existing extradata before allocing a new
buffer.
2011-06-09 10:12:50 -07:00
dbd3183935
swscale: change 48bit RGB input macros to inline functions.
...
Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.
2011-06-09 09:29:20 -04:00
f30ee65700
swscale: change 9/10bit YUV input macros to inline functions.
...
Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.
2011-06-09 09:29:03 -04:00
aa39f5f6d6
swscale: extract gray16 output functions from yuv2packed[12X]().
...
This is part of the Great Evil Plan to simplify swscale.
2011-06-09 09:29:02 -04:00
f1e0b90c64
swscale: use standard clipping functions.
...
This generates better code on some non-x86 architectures.
2011-06-09 09:27:51 -04:00
e458b53605
swscale: merge macros that are used only once.
...
This reduces source code size without affecting the binary.
2011-06-09 09:26:00 -04:00
6e5a8d3c9a
swscale: fix function declarations in swscale.c.
...
Remove inline keyword from functions that are never inlined.
Use av_always_inline for functions that should be force-inlined
for performance reasons. Use av_cold for init functions.
2011-06-09 09:25:59 -04:00
a27db4c349
swscale: fix function declaration keywords in x86/swscale_template.c.
...
Remove inline keyword for functions that are only called through
their function pointers (and thus cannot be inlined); add av_cold
keyword to init function, and use av_always_inline instead of
inline for functions that must be inlined for performance reasons.
2011-06-09 09:25:59 -04:00
f9ecb849ef
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
crypto: Use av_freep instead of av_free
lavf: don't try to free private options if priv_data is NULL.
swscale: fix types of assembly arguments.
swscale: move two macros that are only used once into caller.
swscale: remove unused function.
options: Add missing braces around struct initializer.
mov: Remove leftover crufty debug statement with references to a local file.
dvbsubdec: Fix compilation of debug code.
Remove all uses of now deprecated metadata functions.
Move metadata API from lavf to lavu.
Conflicts:
doc/APIchanges
libavformat/aiffdec.c
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/cafdec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/wtv.c
libavutil/avutil.h
libavutil/internal.h
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 04:47:19 +02:00
7b8ed831eb
jpegdec: actually search for and parse RSTn
...
Fixes Ticket267
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 03:35:50 +02:00
c8d0d8bc76
crypto: Use av_freep instead of av_free
...
This fixes a potential double free.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-09 02:43:55 +02:00
c1ad93c08c
Revert "crypto: fix potential double free"
...
This reverts commit 7d89f7cbf3
2011-06-09 01:39:49 +02:00
1fe3bf3e4b
Revert "build: remove empty $(OBJS) target"
...
This reverts commit b9c6c7cb25
2011-06-08 23:44:18 +02:00
a71bcd1a7f
crypto: Use av_freep instead of av_free
...
This fixes a potential double free.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-08 23:41:53 +03:00
be20528ced
aac: fix adts frame size mask, fix demuxer probing for some files.
2011-06-08 13:12:18 -07:00
dbaba52ed2
lavf: don't try to free private options if priv_data is NULL.
...
This might happen if there was an error before priv_data was allocated
and result in segfault.
2011-06-08 19:51:31 +02:00
47d2ca3205
lavfi: handle NULL lists in avfilter_make_format_list
2011-06-08 18:50:07 +02:00
9bcbb250e2
swscale: fix types of assembly arguments.
...
This prevents the following compiler warnings: "warning:
initialization from incompatible pointer type". Since the
variables are only ever used in inline assembly, their type
is actually irrelevant (so the part where it was wrong did
not invoke any buggy behaviour).
2011-06-08 11:39:26 -04:00
496d95c34c
swscale: move two macros that are only used once into caller.
...
This way, they look like regular code, which is easier to
understand.
2011-06-08 11:33:46 -04:00
9d84dfce93
swscale: remove unused function.
...
Use of this wrapper was removed in a previous patch, but I
forgot to actually remove the function itself.
2011-06-08 11:08:20 -04:00
9e4cb03a93
Fix "mixed declarations and code" warnings.
2011-06-08 16:38:37 +02:00
5bd6ec6d59
options: Add missing braces around struct initializer.
...
This fixes the warning:
libavformat/options.c:62:1: warning: missing braces around initializer [-Wmissing-braces]
2011-06-08 15:01:02 +02:00
b7847a3f2e
mov: Remove leftover crufty debug statement with references to a local file.
2011-06-08 12:01:41 +02:00
a4855adc80
dvbsubdec: Fix compilation of debug code.
2011-06-08 11:53:53 +02:00
d2d67e424f
Remove all uses of now deprecated metadata functions.
2011-06-08 07:43:45 +02:00
d9f80ea2a7
Move metadata API from lavf to lavu.
...
Rename it to AVDictionary, since it will be used as such. Tags
documentation and metadata conversion API is lavf-specific, so remains
there.
2011-06-08 07:43:45 +02:00
d552f616a2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (28 commits)
Remove some non-compiling debug messages.
ffplay: Fix non-compiling debug printf and replace it by av_dlog.
H264: x86 predict init cosmetics.
ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
Move E-AC-3 encoder functions to a separate eac3enc.c file.
ac3enc: remove convenience macro, #define DEBUG
ac3enc: remove unused #define
vc1: re-initialize tables after width/height change.
APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
samplefmt: add av_get_bytes_per_sample()
iirfilter: fix biquad filter coefficients.
swscale: remove duplicate conversion routine in swScale().
swscale: add yuv2planar/packed function typedefs.
swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
swscale: reindent x86 init code.
swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
swscale: cosmetics.
swscale: remove alp/chr/lumSrcOffset.
swscale: un-special-case yuv2yuvX16_c().
shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
...
Conflicts:
doc/APIchanges
libavcodec/ac3enc.c
libavutil/avutil.h
libavutil/samplefmt.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-08 05:25:28 +02:00
7d89f7cbf3
crypto: fix potential double free
2011-06-08 02:20:53 +02:00
1e9b302690
libx264: fix double free
2011-06-08 02:07:36 +02:00
8f2a2e6051
ffplay: remove -debug option
...
The options -loglevel LEVEL -debug FLAGS can be used for achieving the
same objectives, with a finer level of control.
2011-06-08 01:30:52 +02:00
e77a3095bd
ffplay: remove -vismv option
...
Use -vismv 1 instead. Simplify.
2011-06-08 01:30:52 +02:00
21bf6d7aab
mpegvideo: use av_get_picture_type_char() in ff_print_debug_info()
2011-06-08 01:30:52 +02:00
ac4a854811
Remove some non-compiling debug messages.
2011-06-08 00:45:47 +02:00
8543f0f923
ffplay: Fix non-compiling debug printf and replace it by av_dlog.
2011-06-08 00:45:25 +02:00
Stefano Sabatini
Michael Niedermayer
Reimar Döffinger
Anton Khirnov
Ronald S. Bultje
Alex Converse
Etienne Buira
Baptiste Coudurier
Mina Nagy Zaki
Carl Eugen Hoyos
Diego Biurrun