dfc2c4d900
lavf: use designated initialisers for all (de)muxers.
...
It's more readable and less prone to breakage.
2011-07-17 06:58:37 +02:00
45fb647495
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
bitstream: Properly promote av_reverse values before shifting.
libavutil/swscale: YUV444P10/YUV444P9 support.
H.264: Fix high bit depth explicit biweight
h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
Update copyright year for ac3enc_opts_template.c.
adts: Adjust frame size mask to follow the specification.
movenc: Add RTP muxer/hinter options
movenc: Pass the RTP AVFormatContext to the SDP generation
rtspenc: Add RTP muxer options
rtspenc: Add an AVClass for setting muxer specific options
rtpenc_chain: Pass the rtpflags options through to the chained muxer
rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
sdp: Reindent after the previous commit
rtpenc: MP4A-LATM payload support
avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
sdp: Allow passing an AVFormatContext to the SDP generation
mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
swscale: split YUYV output out of yuv2packed[12X]_c().
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/h264dsp_template.c
libavcodec/mpeg12.c
libavformat/aacdec.c
libavformat/avidec.c
libavformat/internal.h
libavformat/movenc.c
libavformat/rtpenc.c
libavformat/rtpenc_latm.c
libavformat/sdp.c
libavformat/version.h
libavutil/avutil.h
libavutil/pixfmt.h
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-11 03:51:36 +02:00
919d7a345a
Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
2011-06-10 19:12:14 +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
ac4a854811
Remove some non-compiling debug messages.
2011-06-08 00:45:47 +02:00
d7cf5639e7
Replace some printf instances in debug code by av_log.
2011-06-07 13:20:57 +02:00
99eb31e263
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (25 commits)
Replace custom DEBUG preprocessor trickery by the standard one.
vorbis: Remove non-compiling debug statement.
vorbis: Remove pointless DEBUG #ifdef around debug output macros.
cook: Remove non-compiling debug output.
Remove pointless #ifdefs around function declarations in a header.
Replace #ifdef + av_log() combinations by av_dlog().
Replace custom debug output functions by av_dlog().
cook: Remove unused debug functions.
Remove stray extra arguments from av_dlog() invocations.
targa: fix big-endian build
v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
vfwcap: add a framerate private option.
v4l2: add a framerate private option.
libdc1394: add a framerate private option.
fbdev: add a framerate private option.
bktr: add a framerate private option.
oma: check avio_read() return value
nutdec: remove unused variable
Remove unused variables
swscale: allocate larger buffer to handle altivec overreads.
...
Conflicts:
ffmpeg.c
libavcodec/dca.c
libavcodec/dirac.c
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pthread.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/shorten.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavdevice/dv1394.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/4xm.c
libavformat/apetag.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/mmf.c
libavformat/mpeg.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/oggdec.c
libavformat/oggparseogm.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/rtpdec_latm.c
libavformat/sauce.c
libavformat/sol.c
libswscale/utils.c
tests/ref/vsynth1/error
tests/ref/vsynth2/error
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-03 05:19:30 +02:00
b751f61106
Remove stray extra arguments from av_dlog() invocations.
2011-06-02 23:11:58 +02:00
045dd4b928
Replace some commented-out debug printf() / av_log() messages with av_dlog().
2011-04-29 17:27:01 +02:00
2cae9809e2
Merge remote branch 'qatar/master'
...
* qatar/master:
fate: fix partial run when no samples path is specified
ARM: NEON fixed-point forward MDCT
ARM: NEON fixed-point FFT
lavf: bump minor version and add an APIChanges entry for avio changes
avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
avio: make url_fdopen internal.
avio: make url_open_dyn_packet_buf internal.
avio: avio_ prefix for url_close_dyn_buf
avio: avio_ prefix for url_open_dyn_buf
avio: introduce an AVIOContext.seekable field
ac3enc: use generic fixed-point mdct
lavfi: add fade filter
Change yadif to not use out of picture lines.
lavc: deprecate AVCodecContext.antialias_algo
lavc: mark mb_qmin/mb_qmax for removal on next major bump.
Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-04-04 02:15:12 +02:00
8978fedaee
avio: introduce an AVIOContext.seekable field
...
Use it instead of url_is_streamed and AVIOContext.is_streamed.
2011-04-03 22:46:40 +02:00
2f9815dd26
fixed issue1962 EVO detection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-04-03 16:40:12 +02:00
5b56ad03fa
Reimplement stream probe try #2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-04-03 16:40:11 +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
f81946729e
lavf: move internal functions from avformat.h to internal.h
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit 19711af5cd
)
2011-02-09 03:31:17 +01:00
19711af5cd
lavf: move internal functions from avformat.h to internal.h
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-06 16:35:00 -05: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
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
612dc0238a
Skip pes payload during probing to avoid start code emulation.
...
Patch by Janne Grunau, janne-ffmpeg jannau net
Originally committed as revision 23286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 12:32:13 +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
0332324a48
Dont give up after 100kb of zero bytes but returnd EAGAIN
...
fixes issue1729
Originally committed as revision 21738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 14:25:57 +00:00
c45ebd5461
Set AVPacket.pos in MPEG-PS demuxer.
...
Originally committed as revision 21604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 16:47:51 +00:00
6de5b62790
Also print the number of invalid packets in the debug output.
...
Originally committed as revision 20763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:24:41 +00:00
55f6524789
Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have
...
been wrong.
Fixes issue1571.
Originally committed as revision 20762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:19:30 +00:00
711e69a730
Improve sofdec dectection to avoid false positives for MP2.
...
Patch by tralph11, tralph11 yahoo
Originally committed as revision 20333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-20 15:27:05 +00:00
c4674a479b
Make mpeg_probe() pass probetest.
...
Originally committed as revision 19854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 12:20:03 +00:00
3489e150d9
Slightly stricter MPEG-PES probing, fixes issue 1383.
...
Originally committed as revision 19852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 10:01:25 +00:00
e8c9383914
Remove 2 ++ from check_pes() that are useless, found by CSA.
...
Originally committed as revision 18577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 18:08:39 +00:00
9ba4821d93
Split TrueHD decoder from MLP
...
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:23:39 +00:00
1aeb55a1de
Mark dvdaudio_substream_type variable as av_uninit to work around false
...
positive uninitialized variable warning.
Originally committed as revision 17825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 19:13:12 +00:00
80e58c6153
Allow demuxing of audio substreams stored as 0x06 type.
...
Fixes issue 725: MPEG2 PS with PCM audio.
On behalf of Jai.
Originally committed as revision 17150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 11:09:36 +00:00
d84d6fbf28
Increase the number of packets required to identify as MPEG PES to keep from
...
identifying MP3 files with padding or garbage at the beginning.
Originally committed as revision 17091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 01:46:01 +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
fb65d2ca84
Use enum typers instead of int.
...
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail
Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:03:00 +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
274335e76c
vertical align
...
Originally committed as revision 14972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 01:29:43 +00:00