1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

19968 Commits

Author SHA1 Message Date
Peter Ross
c63ea92bf2 Electronic Arts Madcow decoder
Originally committed as revision 19178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 02:19:41 +00:00
David Conrad
86b61d4241 Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.

Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 00:50:57 +00:00
Jason Garrett-Glaser
761cb87173 Add "0x11005354" as a fourcc for MOV audio; fixes audio detection in a problematic MOV file.
The audio is actually adpcm_ima_wav.

Originally committed as revision 19176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 00:16:39 +00:00
Alex Converse
d4eeef0c19 Cosmetics: Re-indent after last commit
Originally committed as revision 19175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 21:16:33 +00:00
Alex Converse
85e9296f41 Move TNS and swb_offset tables from aacdectab.h to aactab.c so that they can be
shared with the AAC encoder.

Originally committed as revision 19174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 21:14:45 +00:00
Alex Converse
70f99f8dd2 Do not include libavcodec/internal.h in the ADTS muxer.
Originally committed as revision 19173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 19:49:46 +00:00
Jason Garrett-Glaser
fc3fc0293d Add new FOURCC (0x0003) for raw DIB video, set flip flag accordingly.
Fixes a few AVI files from what is probably a mobile phone video camera.

Originally committed as revision 19172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 17:39:56 +00:00
Sascha Sommer
c0e9b2e84f Move run level decode functionality to ff_wma_run_level_decode
so that it can be reused for wmapro

Originally committed as revision 19171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 16:00:26 +00:00
Sascha Sommer
e8c7f81cf2 cosmetics: Add brackets between if/else
Originally committed as revision 19170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 15:48:41 +00:00
Sascha Sommer
523c09ca44 Add additional sample rates to the frame len bits calculation code
Originally committed as revision 19169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 15:38:11 +00:00
Sascha Sommer
eff9011d17 Fix placment of the DPCM Xan comment
Originally committed as revision 19168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 15:27:10 +00:00
Sascha Sommer
cee4bb894d Move frame len bits calculation to ff_wma_get_frame_len_bits
so that it can be reused for wmapro

Originally committed as revision 19167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 15:21:43 +00:00
Jai Menon
8e6e9bacc4 Associate the 0x6c75 TwoCC used in certain Kodak cameras
to the PCM Mu-law decoder.
Fixes Issue 1178.

Originally committed as revision 19166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 13:21:01 +00:00
Diego Biurrun
ae1374ce10 cosmetics: Prettyprint and reformat wma.c closer to K&R style.
Originally committed as revision 19165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 13:12:13 +00:00
Baptiste Coudurier
761c8c923e Fail and print correct error message when video stream pixel format
is unknown.

Originally committed as revision 19164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 08:15:37 +00:00
Jimmy Christensen
94d3d6a468 DPX (Digital Picture Exchange) image decoder
patch by Jimmy Christensen, jimmy ghost dk

Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 05:29:29 +00:00
David Conrad
34edd9948d Add sac3 to mp4 fourccs for mov+h264+aac-sac3+mp4s+ETERNAL_cut.mp4
Originally committed as revision 19162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 05:26:40 +00:00
Jason Garrett-Glaser
14ed2d9983 Add "m2v1" to fourccs for MPEG-2 video; fixes some MOV files.
Originally committed as revision 19161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 02:20:26 +00:00
Jeff Downs
d468ff0fdf Fix cast of byte buffer to uint32 that was disregarding alignment
requirements.
Now calculates crc byte at a time until aligned, then continues with uint32
optimized calculation.
This fixes crashes during mlp decoding on sparc (at least, maybe others).

Originally committed as revision 19160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 02:13:12 +00:00
Jason Garrett-Glaser
be43ae6651 Add alternate fourcc for QCELP audio (qclq). Fixes a problematic MOV file.
Originally committed as revision 19159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 01:09:49 +00:00
Diego Biurrun
1d4b1bf2f6 cosmetics: Prettyprint one more line to have columns line up.
Originally committed as revision 19158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 20:45:35 +00:00
Diego Biurrun
477ffff218 The internal header libavutil/internal.h should not be used outside libavutil.
Originally committed as revision 19157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 20:18:29 +00:00
Ramiro Polla
fdf70cc5c9 Kill warnings of possibly unused variables by using av_unused.
Originally committed as revision 29355 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-06-11 17:10:54 +00:00
Diego Biurrun
7d7b8c32c9 cosmetics: Reformat to K&R and prettyprint newly created files.
Originally committed as revision 19156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 15:35:23 +00:00
Patrick Dehne
7541118286 Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 15:26:57 +00:00
Diego Biurrun
dc8229015c Fix compilation: #undef standard library functions that are
forbidden within FFmpeg, but allowed in example code.

Originally committed as revision 29354 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-06-11 15:15:43 +00:00
Diego Biurrun
02163b799d Add libavutil/internal.h #include, required for the DECLARE_ALIGNED macro.
This fixes swscale-example compilation.

Originally committed as revision 29353 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-06-11 10:19:04 +00:00
Diego Biurrun
0ef37cd52e cosmetics: Reformat file to K&R style upon Kostya's request.
Originally committed as revision 19154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 10:16:51 +00:00
Diego Biurrun
233816820d 10l: Add vc1dec.o to the list of WMV3 objects, same as for VC-1.
Even after the split into shared and decoder-specific code, WMV3
continues to have the same dependencies as VC-1.

Originally committed as revision 19153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 09:40:24 +00:00
Diego Biurrun
b761659bef Split decoder-specific code off from vc1.c into vc1dec.c and keep code
shared between decoder and parser in vc1.c.

Originally committed as revision 19152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 09:31:31 +00:00
Baptiste Coudurier
844d17fb14 Add const in cast. Removes warning:
libavcodec/resample.c:215: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 19151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 08:16:08 +00:00
Baptiste Coudurier
89bc05d1ea give s->resample_context to avoid segfault, avclass was moved
Originally committed as revision 19150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 08:14:50 +00:00
David Conrad
77fc598d98 Disable native Vorbis encoder; quality is much worse than libvorbis and
there really isn't a reason to use it on purpose unless you're improving it.

Originally committed as revision 19149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 06:28:06 +00:00
Baptiste Coudurier
bbe46bc4c2 Remove time_rate, we cannot compute exactly when fragments are
used and we cannot determine if fragments are present or not in
streamed mode.

Originally committed as revision 19148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 05:13:23 +00:00
Baptiste Coudurier
818062f2f3 if b frames are parsed, set codec->has_b_frames
Originally committed as revision 19147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 04:30:05 +00:00
Baptiste Coudurier
aa9b754ffc Remove even condition on pad and crop.
Odd padding or cropping is needed when encoders only support
even resolution.

Originally committed as revision 19146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 04:07:29 +00:00
Diego Biurrun
17492d5e40 Add code to enable and disable all VAAPI and VDPAU parts.
As a positive sideeffect, VAAPI/VDPAU objects need no longer be listed
for all VAAPI/VDPAU-related decoders.

Originally committed as revision 19145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-10 20:50:53 +00:00
Diego Biurrun
9da1115877 Remove Mans as MPEG-TS maintainer, he never intended to maintain MPEG-TS.
Originally committed as revision 19144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-10 19:36:18 +00:00
Luca Barbato
ec606b36b4 Support seeking as defined by the rfc
a PLAY with Range alone while in PLAY status should be interpreted
as an enqueue
a PAUSE followed by a PLAY with Range is the proper way to ask to
seek to a point.

See rfc2326

Originally committed as revision 19143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-10 15:08:02 +00:00
Luca Barbato
4db819bc7f Make sure buffer end remains constant within the loop
otherwise ff_find_start_code could read over the buffer size

Originally committed as revision 19142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-10 14:56:50 +00:00
Haruhiko Yamagata
b19d493f2b Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
progressive.

Patch by Haruhiko Yamagata, h D yamagata A nifty D com

Originally committed as revision 19141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 21:16:40 +00:00
Ronald S. Bultje
277a28e8fc Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
make get/parse_packet static" thread from 2 months ago.

Originally committed as revision 19140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 20:58:32 +00:00
Diego Biurrun
28b80940ff Express the H.264 parser dependency on the golomb code in configure instead of
in the Makefile as it is done for all other parts that depend on golomb.

Originally committed as revision 19139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 20:29:52 +00:00
Diego Biurrun
ef434a4b24 Add missing dependencies for H.264 and VC-1 parsers.
Originally committed as revision 19138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 20:07:01 +00:00
Jai Menon
3dfadf7b1e Add additional dependencies for sdp and rtsp demuxers.
This fixes compilation when the rtsp muxer is disabled.

Originally committed as revision 19137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 18:30:15 +00:00
Luca Abeni
747069e254 Properly initialize AVFrames to default values in the MPEG decoder (fixes
the AVFrame pts when decoding MPEG 1 and 2 video)

Originally committed as revision 19136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 10:06:25 +00:00
Diego Biurrun
9d58d4717a cosmetics: Add missing ending backslash to installed header list.
Originally committed as revision 19135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 07:18:58 +00:00
Michael Niedermayer
f1b99cc63b Clarify (re)get_buffer() and CODEC_CAP_DR1 relation.
Originally committed as revision 19132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-07 19:30:54 +00:00
Diego Biurrun
1e15e5366f Remove comments that refer to fixed-point AMR implementations.
Originally committed as revision 19130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-07 15:15:45 +00:00
Baptiste Coudurier
ae8d21fb45 clarify avcodec_decode_audio3 and avcodec_decode_video2 doxygen
Originally committed as revision 19128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 20:16:53 +00:00