cd8cb54990
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ARM: ac3dsp: optimised update_bap_counts()
mpegaudiodec: Fix av_dlog() invocation.
h264/10bit: add HAVE_ALIGNED_STACK checks.
Update 8-bit H.264 IDCT function names to reflect bit-depth.
Add IDCT functions for 10-bit H.264.
mpegaudioenc: Fix broken av_dlog statement.
Employ correct printf format specifiers, mostly in debug output.
ARM: fix MUL64 inline asm for pre-armv6
Conflicts:
libavcodec/mpegaudioenc.c
libavformat/ape.c
libavformat/mxfdec.c
libavformat/r3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-02 05:12:10 +02:00
b0a4e5f9e7
Employ correct printf format specifiers, mostly in debug output.
2011-05-31 23:45:14 +02:00
fd38a15adf
Fix various bad printf format warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-30 00:03:06 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
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
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
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 17:20:31 -05:00
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
2011-03-05 02:29:31 +01:00
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:57 -05:00
74b3f67c9c
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2
2011-03-03 14:15:08 +01:00
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
2011-03-03 14:15:03 +01:00
e356fc57a2
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:22:16 -05:00
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:12:33 -05:00
e63a362857
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83
2011-02-22 02:44:37 +01:00
b7effd4e83
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 11:23:22 -05:00
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
2011-02-20 19:05:47 +01:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
2011-01-30 03:41:48 +01:00
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
66355be3c3
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e
2011-01-28 03:15:34 +01:00
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-26 22:10:09 +00:00
354b757300
Zero-initialize structs/arrays with {0} instead of {}, which isn't proper C99
...
Patch by Axel Holzinger, aholzinger at gmx dot de
Originally committed as revision 24391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 17:27:28 +00:00
39bb30f664
Change all functions referenced in the mxf_metadata_read_table to use the same
...
prototype and also always call them with exactly those arguments.
The previous way seems to have worked on all supported platforms, however
it was not strictly valid C and would crash e.g. with a compiler that
uses stdcall by default.
Also avoids warnings if -Wstrict-prototypes is used.
Originally committed as revision 23939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 17:10:31 +00:00
11fdc4d4fc
mxfdec: Improve parsing of the PixelLayout item
...
Originally committed as revision 23898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 07:55:05 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
c7a38887c1
Do D10 AES3 audio conversion in-place instead of using a large on-stack buffer.
...
Originally committed as revision 20567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 23:12:55 +00:00
1e69999334
MXF: simply ignore tracks that are invalid due to not having a valid Sequence
...
part instead of failing completely.
This partly fixes issue 1470 (broken files created by BBC ingex recorder).
Originally committed as revision 20221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-13 08:08:10 +00:00
9291fdf7bc
return AVERROR_EOF
...
Originally committed as revision 18993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 06:16:44 +00:00
8be080aebb
free Track and unset priv_data to avoid double free, fix memleak
...
Originally committed as revision 18836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 05:33:05 +00:00
b4800b8b7d
protect realloc overflow
...
Originally committed as revision 18088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 00:50:51 +00:00
5ac4d7689d
reuse MXFCodecUL for data def and simplify
...
Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:12:30 +00:00
251bf87560
remove implicit header inclusions from mxf.h
...
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:42:38 +00:00
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
8a47ad5e7c
use lower case x and alternate format for hex in printf
...
Originally committed as revision 16494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-08 02:57:21 +00:00
861b4f012a
print more debug information if enabled, including index
...
Originally committed as revision 16493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-08 02:54:43 +00:00
bc5c918ea8
Remove offset_t typedef and use int64_t directly instead.
...
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.
Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
5813a29eb1
revert r14983, value is not sample aspect ratio, it is display aspect ratio
...
Originally committed as revision 15352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-17 23:14:48 +00:00
66ec3d56a2
print stream index in decimal not in hex, easier for debugging
...
Originally committed as revision 15279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 02:56:13 +00:00
dd1c8f3e6e
Bump Major version, this commit is almost just renaming bits_per_sample to
...
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
4ee873e39d
put back mxf_essence_container_uls in demuxer as static const
...
Originally committed as revision 15083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:39:42 +00:00
2a242f4514
mxfdec: set sample_aspect_ratio
...
Originally committed as revision 14983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 20:21:39 +00:00
1b0732ea64
Remove useless #ifdef DEBUG (patch by Zhentan Feng).
...
Originally committed as revision 14853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 21:58:47 +00:00
c69968b4fe
Factorize common code out of the mxf demuxer.
...
Patch by zhentan feng.
Originally committed as revision 14826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 17:54:18 +00:00
d09ea6baaf
rename mxf.c to mxfdec.c
...
Originally committed as revision 14655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-07 02:12:14 +00:00
Michael Niedermayer