Commit Graph

167 Commits

Author SHA1 Message Date
Clément Bœsch
215b7724e7 lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
Michael Niedermayer
9d76cf0b18 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtpdec: Templatize the code for different g726 bitrate variants
  rv40: move loop filter to rv34dsp context
  lavf: make av_set_pts_info private.
  rtpdec: Add support for G726 audio
  rtpdec: Add an init function that can do custom codec context initialization
  avconv: make copy_tb on by default.
  matroskadec: don't set codec timebase.
  rmdec: don't set codec timebase.
  avconv: compute next_pts from input packet duration when possible.
  lavf: estimate frame duration from r_frame_rate.
  avconv: update InputStream.pts in the streamcopy case.

Conflicts:
	avconv.c
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/oss_audio.c
	libavdevice/v4l.c
	libavdevice/v4l2.c
	libavdevice/vfwcap.c
	libavdevice/x11grab.c
	libavformat/au.c
	libavformat/eacdata.c
	libavformat/flvdec.c
	libavformat/mpegts.c
	libavformat/mxfenc.c
	libavformat/rtpdec_g726.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 02:54:24 +01:00
Anton Khirnov
c3f9ebf743 lavf: make av_set_pts_info private.
It's supposed to be called only from (de)muxers.
2011-11-30 20:34:45 +01:00
Michael Niedermayer
d0492578c8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  presets: rename presets directory
  lavc: make avcodec_get_context_defaults3 "officially" public
  lavf: replace av_new_stream->avformat_new_stream part II.
  lavf,lavd: replace av_new_stream->avformat_new_stream part I.
  lavf: add avformat_new_stream as a replacement for av_new_stream.
  Use correct scaling table for bwd-pred MVs in second B-field
  Ut Video decoder
  Makefile: change presets extension to .avpreset
  lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
  lavfi: add testsrc source
  AVOptions: add documentation.
  presets: update libx264 ffpresets

Conflicts:
	Changelog
	doc/APIchanges
	doc/ffmpeg.texi
	ffpresets/libx264-ipod320.ffpreset
	ffpresets/libx264-ipod640.ffpreset
	ffserver.c
	libavcodec/avcodec.h
	libavcodec/options.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavfilter/avfilter.h
	libavfilter/vsrc_testsrc.c
	libavformat/flvdec.c
	libavformat/riff.c
	libavformat/version.h
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20 02:34:51 +02:00
Anton Khirnov
3b3bbdd3e6 lavf,lavd: replace av_new_stream->avformat_new_stream part I.
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
2011-10-19 17:02:11 +02:00
Michael Niedermayer
78accb876c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
	ffmpeg.c
	libavformat/avidec.c
	libavformat/matroskaenc.c
	libavformat/mp3enc.c
	libavformat/oggenc.c
	libavformat/utils.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17 20:12:02 +02:00
Anton Khirnov
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
Reimar Döffinger
3c10843f15 Use av_set_pts_info to set time_base.
Also remove useless assignments of 0, the priv
context is initialized to 0.
2011-04-16 17:51:00 +02:00
Reimar Döffinger
f0a68a20a7 Enable header parsing for MPEG2VIDEO to get time-stamps.
FFmpeg can generate pts and dts on its own, but only
if we enable parsing, so do that.
This fixes ticket #46.
2011-04-16 17:44:42 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +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
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:12:33 -05:00
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
Diego Elio Pettenò
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
Diego Elio Pettenò
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
Peter Ross
1c4ac03530 electronicarts: prevent endless loop opportunity in process_audio_header_elements()
Fixes issue2529.

Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 02:25:12 +00:00
Peter Ross
74093bb593 revert r26302
Originally committed as revision 26305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 22:25:45 +00:00
Peter Ross
e19e051e56 electronicarts: prevent endless loop opportunity in process_audio_header_elements()
Fixes issue2529.

Originally committed as revision 26302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 12:56:50 +00:00
Peter Ross
42396c2e67 electronicarts: only apply audio sanity checks when audio stream is present
Originally committed as revision 26301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 12:51:45 +00:00
Daniel Kang
cb77dad724 perform sanity check on sample rate in electronicarts demuxer
Fixes issue2525
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 11:38:38 +00:00
Daniel Kang
4da766ce65 perform sanity check on number of channels in electronicarts demuxer
Fixes issue2514
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 11:02:07 +00:00
Måns Rullgård
8fc0162ac4 Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +00:00
Stefano Sabatini
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
Carl Eugen Hoyos
e6a9dd6a7d Use enum CodecID where appropriate.
Originally committed as revision 21119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 08:57:20 +00:00
Peter Ross
add5badbc1 do not create Electronic Arts audio stream when unsupported revision2 audio codec is present [issue1516]
Originally committed as revision 21116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 05:08:42 +00:00
Reimar Döffinger
892d7e78ef Slightly improve probe for ea format by checking that it is possible to
guess whether the file is little- or big-endian.

Originally committed as revision 19896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:07:27 +00:00
Peter Ross
eacfe8581d Electronic Arts demuxer: support Madcow video tag
Originally committed as revision 19179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 02:20:54 +00:00
Reimar Döffinger
c3481d18b4 Remove unused audio_pts field from ea demuxer struct
Originally committed as revision 18538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-16 12:46:06 +00:00
Reimar Döffinger
c96495e75c Move ea demuxer messages that are irrelevant to ordinary users from
AV_LOG_INFO to AV_LOG_DEBUG.

Originally committed as revision 18464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:53:22 +00:00
Reimar Döffinger
46e97dc3c2 Reindent
Originally committed as revision 18429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 10:41:06 +00:00
Reimar Döffinger
f772b7fa7d Make electronicarts demuxer return partial frames, this is the default
behaviour of av_get_packet and should not be override without good reason.
As a side effect this fixes the memleak described in issue 956.
Also return the exact error code from av_get_packet instead of AVERROR(EIO).

Originally committed as revision 18428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 10:38:56 +00:00
Diego Biurrun
b57ac115ae Add av_uninit macro to variable to avoid false positive warning:
libavformat/electronicarts.c: In function ‘ea_read_packet’:
libavformat/electronicarts.c:447: warning: ‘num_samples’ may be used uninitialized in this function

Originally committed as revision 17157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 15:01:52 +00:00
Peter Ross
468d298d0c Electronic Arts demuxer: support TQI video tag
Originally committed as revision 17003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 08:59:38 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:19:48 +00:00
Peter Ross
d2299316ce Electronic Arts demuxer: support TGQ video tags
Originally committed as revision 15791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 00:39:31 +00:00
Luca Abeni
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
Peter Ross
fc7ed9a6f6 Support Electronic Arts files containing MP3 audio.
Originally committed as revision 14824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 12:39:57 +00:00
Peter Ross
ebc22cc29f Electronic Arts demuxer: support SxEN audio tags found in 'Need for Speed: Pro Street' computer game.
Originally committed as revision 14713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 12:36:00 +00:00
Peter Ross
6819af8245 Electronic Arts demuxer: perform identification of ADPCM EA R2 codec using revision2 flag.
Originally committed as revision 14710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:35:09 +00:00
Peter Ross
a07f117804 Electronic Arts demuxer: ignore PTxx platform ID values.
Originally committed as revision 14709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:33:32 +00:00
Peter Ross
d3302b7011 Support Electronic Arts files containing MPEG2VIDEO.
Originally committed as revision 14708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:32:59 +00:00
Peter Ross
d9d9a8c028 Add MDEC tags to Electronic Arts demuxer.
Originally committed as revision 14679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 01:58:46 +00:00
Peter Ross
bbf020e977 Add Electronic Arts TGV chunk tags to EA demuxer.
Originally committed as revision 14643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 08:34:35 +00:00
Peter Ross
af8ed96f45 EA Demuxer: make rev2 flag optional
Originally committed as revision 14474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 07:41:32 +00:00
Peter Ross
b2f181c270 Electronic Arts CMV demuxer
Originally committed as revision 14111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 13:24:13 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Carl Eugen Hoyos
696c30688b Fix icc warning #188: enumerated type mixed with another type
Originally committed as revision 13144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 15:51:37 +00:00
Aurelien Jacobs
725d86bfd5 add pcm_s16le_planar support for electronicarts files
Originally committed as revision 11092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-25 16:32:47 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Aurelien Jacobs
968fc6b96a probe more kind of electronic arts files
Originally committed as revision 10947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 23:01:32 +00:00
Peter Ross
fac84d3c18 EA IMA EACS decoder
original patch by Peter Ross

Originally committed as revision 10880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:20:26 +00:00
Peter Ross
7bb65d8964 EA IMA SEAD decoder
original patch by Peter Ross

Originally committed as revision 10879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:12:18 +00:00
Aurelien Jacobs
97e6ee2064 probe files starting with the 1SNh tag
Originally committed as revision 10861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-25 21:17:39 +00:00
Aurelien Jacobs
94e8c227ba don't use #define with names starting with _
Originally committed as revision 10860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-25 21:10:18 +00:00
Aurelien Jacobs
98168220b0 add parsing of 1SNh header in the EA demuxer
Originally committed as revision 10859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-25 20:38:49 +00:00
Aurelien Jacobs
446263879b avoid infinite loop at the end of files which are not properly terminated
Originally committed as revision 10857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 21:44:20 +00:00
Peter Ross
e758396268 EA ADPCM R1, R2 and R3 decoder
original patch by Peter Ross

Originally committed as revision 10856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 20:49:42 +00:00
Aurelien Jacobs
39fe9d79ad convert a if() into a switch() to ease addition of new tags to probe
Originally committed as revision 10843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 21:06:04 +00:00
Aurelien Jacobs
ab89dbd43e better check for video track detection
Originally committed as revision 10807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:52:08 +00:00
Aurelien Jacobs
018d0ff973 skip unsupported audio track data
Originally committed as revision 10806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:50:52 +00:00
Aurelien Jacobs
a2c9473d96 cosmetics: indentation
Originally committed as revision 10805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:44:05 +00:00
Aurelien Jacobs
c611463fe4 check if we found an audio track before initializing the audio stream
Originally committed as revision 10804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:42:54 +00:00
Aurelien Jacobs
200f41ad2e compute pts according to the audio codec
Originally committed as revision 10803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:40:03 +00:00
Aurelien Jacobs
ffbd0bcdb6 set bytes per sample in the context
Originally committed as revision 10802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:36:12 +00:00
Aurelien Jacobs
597958ada7 fix big endian files support
Originally committed as revision 10801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:22:50 +00:00
Aurelien Jacobs
7816845064 simplify
Originally committed as revision 10800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:21:31 +00:00
Aurelien Jacobs
6c867e0463 parse sample rate instead of setting a default one
Originally committed as revision 10799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:13:46 +00:00
Aurelien Jacobs
fd402a5a63 add support for PCM codec
Originally committed as revision 10798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:05:30 +00:00
Aurelien Jacobs
93fa8b2bf5 check compression_type to assign audio codec
Originally committed as revision 10797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:53:37 +00:00
Aurelien Jacobs
e5d34ab6d0 make compression_type a function local var instead of a context var
Originally committed as revision 10796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:47:56 +00:00
Aurelien Jacobs
97e5dcc0f3 add support for big_endian encoded headers
Originally committed as revision 10795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:39:27 +00:00
Aurelien Jacobs
2c82386df2 add some error processing
Originally committed as revision 10794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:32:26 +00:00
Aurelien Jacobs
fa34563b2c cosmetics: indentation
Originally committed as revision 10793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:27:27 +00:00
Aurelien Jacobs
f8cab062ca parse header chunk in a loop (don't depend on a fixed chunk ordering)
Originally committed as revision 10792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:26:23 +00:00
Aurelien Jacobs
af704ee420 add audio and video codec context vars
Originally committed as revision 10791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:23:30 +00:00
Aurelien Jacobs
080b1c8238 better log message
Originally committed as revision 10790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:11:53 +00:00
Aurelien Jacobs
f409743084 move vp6 header parsing into its own function
Originally committed as revision 10789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 22:01:30 +00:00
Aurelien Jacobs
3773e5fc1b remove 2 temporary variables
Originally committed as revision 10788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 21:59:23 +00:00
Aurelien Jacobs
9853ce8074 set a default value for num_channels
Originally committed as revision 10787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 21:56:44 +00:00
Aurelien Jacobs
215eb1028d move audio header parsing in its own function
Originally committed as revision 10786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 21:55:51 +00:00
Aurelien Jacobs
d51bd73ce6 add a log message
Originally committed as revision 10785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 21:45:53 +00:00
Aurelien Jacobs
1680692a6c fix comment
Originally committed as revision 10784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 21:30:33 +00:00
Aurelien Jacobs
227a388d07 cosmetics: reindent
Originally committed as revision 10753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 22:52:22 +00:00
Aurelien Jacobs
d3e412d0cc add support for VP6 in electronicarts demuxer
Originally committed as revision 10752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 22:51:52 +00:00
Aurelien Jacobs
c03c4cac82 remove useless &0xFF
Originally committed as revision 10751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 22:51:15 +00:00
Aurelien Jacobs
a066c5b7c9 merge declaration and initialization
Originally committed as revision 10750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 22:50:36 +00:00
Aurelien Jacobs
df2eef0fef remove unused context vars
Originally committed as revision 10749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 22:50:10 +00:00