generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
70,225 Commits 24 Branches 241 Tags 173 MiB
1f5c7781e6
Commit Graph

1094 Commits

Author SHA1 Message Date
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
84ad31ff18 lavf: replace av_new_stream->avformat_new_stream part II. 
Manual replacements are done in this commit.

In many cases, the id is some constant made up number (e.g. 0 for video
and 1 for audio), which is then not used in the demuxer for anything.
Those ids are removed.
 2011-10-19 17:02:11 +02:00
Michael Niedermayer
be401448e5 mov: Raise ctts dts_shift threshold by 1 
This fixes issue2246neu.mp4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-19 02:56:41 +02:00
Michael Niedermayer
fae714a9fb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: add presets
  rtsp: Expose the flag options via private AVOptions for sdp and rtp, too
  rtsp: Make the rtsp flags avoptions set via a define
  rtpenc: Set a default video codec
  avoptions: Fix av_opt_flag_is_set
  rtp: Fix ff_rtp_get_payload_type
  doc: Update the documentation on setting options for RTSP
  rtsp: Remove the separate filter_source variable
  rtsp: Accept options via private avoptions instead of URL options
  rtsp: Simplify AVOption definitions
  rtsp: Merge the AVOption lists
  lavfi: port libmpcodecs delogo filter
  lavfi: port boxblur filter from libmpcodecs
  lavfi: add negate filter
  lavfi: add LUT (LookUp Table) generic filters
  AVOptions: don't segfault on NULL parameter in av_set_options_string()
  avio: Check for invalid buffer length.
  mpegenc/mpegtsenc: add muxrate private options.
  lavf: deprecate AVFormatContext.file_size
  mov: add support for TV metadata atoms tves, tvsn and stik

Conflicts:
	Changelog
	doc/filters.texi
	doc/protocols.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfilter.h
	libavfilter/formats.c
	libavfilter/internal.h
	libavfilter/vf_boxblur.c
	libavfilter/vf_delogo.c
	libavfilter/vf_lut.c
	libavformat/mpegtsenc.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-18 01:54:40 +02:00
Raivo Hool
f055635313 mov: add support for TV metadata atoms tves, tvsn and stik 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-17 08:12:12 +02:00
Michael Niedermayer
bd4ebbbbed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresdsp: fix function prototypes.
  prores-idct: fix overflow in c code.
  fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
  prores: add missing feature warning for alpha
  mov: 10l: Terminate string with 0 not '0'
  mov: Prevent illegal writes when chapter titles are very short.
  prores: add appropriate -fix_fmt parameter to FATE command
  riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
  lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
  lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Conflicts:
	libavcodec/avcodec.h
	libavformat/mov.c
	tests/fate/prores.mak
	tests/ref/acodec/g726
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 22:24:00 +02:00
Alex Converse
7ad06beb2c mov: 10l: Terminate string with 0 not '0' 2011-10-14 10:38:42 -07:00
Alex Converse
8fb22c3d47 mov: Prevent illegal writes when chapter titles are very short. 2011-10-14 10:36:18 -07:00
Michael Niedermayer
b81f8880e0 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (23 commits)
  fix AC3ENC_OPT_MODE_ON/OFF
  h264: fix HRD parameters parsing
  prores: implement multithreading.
  prores: idct sse2/sse4 optimizations.
  swscale: use aligned move for storage into temporary buffer.
  prores: extract idct into its own dspcontext and merge with put_pixels.
  h264: fix invalid shifts in init_cavlc_level_tab()
  intfloat_readwrite: fix signed addition overflows
  mov: do not misreport empty stts
  mov: cosmetics, fix for and if spacing
  id3v2: fix NULL pointer dereference
  mov: read album_artist atom
  mov: fix disc/track numbers and totals
  doc: fix references to obsolete presets directories for avconv/ffmpeg
  flashsv: return more meaningful error value
  flashsv: fix typo in av_log() message
  smacker: validate channels and sample format.
  smacker: check buffer size before reading output size
  smacker: validate number of channels
  smacker: Separate audio flags from sample rates in smacker demuxer.
  ...

Conflicts:
	cmdutils.h
	doc/ffmpeg.texi
	libavcodec/Makefile
	libavcodec/motion_est_template.c
	libavformat/id3v2.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 05:40:57 +02:00
Luca Barbato
30c3d976f1 mov: do not misreport empty stts 
Return -1 instead of ENOMEM if entries is 0.
Fixes a av_malloc(0) crash in macosx.
 2011-10-11 15:06:50 +02:00
Luca Barbato
5a7ba58657 mov: cosmetics, fix for and if spacing 2011-10-11 15:06:11 +02:00
Raivo Hool
2804d32075 mov: read album_artist atom 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-11 14:56:41 +02:00
Raivo Hool
dff4177546 mov: fix disc/track numbers and totals 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-11 14:56:41 +02:00
Tomas Härdin
e571305a71 mov: Only touch extradata in mov_read_extradata() if codec_id is what we expect 
Extradata should only be parsed from the avss, fiel, jp2h and alac atoms for
AVS, MJPEG, Motion JPEG 2000 and ALAC respectively.
This also fixes the mov demuxer coming up with bogus extradata for some
AVC-Intra samples due to the presence of fiel atoms.
 2011-09-29 15:07:28 -07:00
Carl Eugen Hoyos
d5d027682c Use the parser for AC-3 in mov. 
Fixes ticket #494.
 2011-09-21 23:42:03 +02:00
Michael Niedermayer
3e1a7ae44a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swfdec: Add support for sample_rate_code 0 (5512 Hz)
  dct-test: factor out some common code and do whas was likely intended
  doc: library versions need to be bumped in version.h
  Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
  Remove some forgotten AVCodecContext.palctrl usage.
  lavc/utils: move avcodec_init() higher in the file.
  lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
  ac3dec: actually use drc_scale private option
  lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
  alsa: add missing header
  msmpeg4: remove leftover unused debug variable declaration
  Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
  Fix av_dlog invocations with wrong or missing logging context.
  vf_yadif: add support to yuva420p
  vf_yadif: correct documentation on the parity parameter
  vf_yadif: copy buffer properties like aspect for second frame as well
  oma: support for encrypted files
  id3v2: add support for non-text and GEOB type tag frames
  des: add possibility to calculate DES-CBC-MAC with small buffer

Conflicts:
	ffmpeg.c
	libavcodec/dct-test.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-21 21:25:43 +02:00
Anton Khirnov
609a2fa1fa Remove some forgotten AVCodecContext.palctrl usage. 2011-09-21 13:51:53 +02:00
Michael Niedermayer
cadbe4ecd1 mov: Fix grayscale Cinepak in mov 
Fixes Ticket165

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-20 06:19:25 +02:00
Baptiste Coudurier
f33be93b1b mov: read tmcd tag and set timecode drop flag accordingly. 2011-08-30 09:14:05 +02:00
Michael Niedermayer
876d1d796b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
  mpeg12: propagate chunk decode errors and fix conditional indentation
  vc1: fix VC-1 Pulldown handling.
  VC1: Fix first/last row checks with slices
  mp4: Handle non-trivial ES Descriptors.
  vc1: properly zero coded_block[] edges on new slice entry.

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-26 01:29:40 +02:00
Alex Converse
ad6c7c1b52 mp4: Handle non-trivial ES Descriptors. 2011-08-25 11:53:21 -07:00
Thierry Foucu
1892052f8d mov: Set negative Sample_duration in STTS to 1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-13 03:39:58 +02:00
Michael Niedermayer
4095fa9038 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dnxhddec: optimise dnxhd_decode_dct_block()
  rtp: remove disabled code
  eac3enc: use different numbers of blocks per frame to allow higher bitrates
  dnxhd: add regression test for 10-bit
  dnxhd: 10-bit support
  dsputil: update per-arch init funcs for non-h264 high bit depth
  dsputil: template get_pixels() for different bit depths
  dsputil: create 16/32-bit dctcoef versions of some functions
  jfdctint: add 10-bit version
  mov: add clcp type track as Subtitle stream.
  mpeg4: add Mpeg4 Profiles names.
  mpeg4: decode Level Profile for MPEG4 Part 2.
  ffprobe: display bitstream level.
  imgconvert: remove unused glue and xglue macros

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-22 12:08:52 +02:00
Thierry Foucu
73c0dd939d mov: add clcp type track as Subtitle stream. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-21 09:34:41 -07: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
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-04 00:45:21 +02:00
Mans Rullgard
0ebcdf5cda Do not include mathematics.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Mans Rullgard
ee8aecd23a Do not include intfloat_readwrite.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Mans Rullgard
add41decd9 Remove return statements following infinite loops without break 
These statements cannot be reached and are thus not needed.
This removes a number of compiler warnings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:39:07 +01:00
Michael Niedermayer
6cbe81999b Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
  document libswscale bump
  error_resilience: skip last-MV predictor step if MVs are not available.
  error_resilience: actually add counter when adding a MV predictor.
  ...

Conflicts:
	Changelog
	libavcodec/error_resilience.c
	libavfilter/defaults.c
	libavfilter/vf_drawtext.c
	libswscale/swscale.h
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 03:38:25 +02:00
Yusuke Nakamura
ae88e9cf99 mov: Fix empty edit detection. 2011-06-19 18:15:56 -07:00
Aurelien Jacobs
e6ba3d4281 replace remaining usage of deprecated av_metadata_set2() by av_dict_set() 2011-06-13 19:02:50 +02:00
Michael Niedermayer
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
Dave Badia
d3cef0a85b Extract rotation in MOV metadata 2011-06-10 22:13:26 +02:00
Yusuke Nakamura
f33a6a22b4 mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-10 09:06:02 +02:00
Michael Niedermayer
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
Alex Converse
85e9e3a9fa movdec: Add support for the 'wfex' atom. 
The 'wfex' is just a Microsoft WaveFormatEx struct.
 2011-06-09 10:14:32 -07:00
Michael Niedermayer
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
Diego Biurrun
b7847a3f2e mov: Remove leftover crufty debug statement with references to a local file. 2011-06-08 12:01:41 +02:00
Anton Khirnov
d2d67e424f Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
Michael Niedermayer
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
Diego Biurrun
02a8d43adf Replace some av_log/printf + #ifdef combinations by av_dlog. 2011-06-07 13:20:58 +02:00
Michael Niedermayer
87f40364d1 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  build: simplify commands for clean target
  swscale: split swscale.c in unscaled and generic conversion routines.
  swscale: cosmetics.
  swscale: integrate (literally) swscale_template.c in swscale.c.
  swscale: split out x86/swscale_template.c from swscale.c.
  swscale: enable hScale_altivec_real.
  swscale: split out ppc _template.c files from main swscale.c.
  swscale: remove indirections in ppc/swscale_template.c.
  swscale: split out unscaled altivec YUV converters in their own file.
  mpegvideoenc: fix multislice fate tests with threading disabled.
  mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
  build: Simplify texi2html invocation through the --output option.
  Mark some variables with av_unused
  Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().
  svq3: Check negative mb_type to fix potential crash.
  svq3: Move svq3-specific fields to their own context.
  rawdec: initialize return value to 0.
  Remove unused get_psnr() prototype
  rawdec: don't leak option strings.
  bktr: get default framerate from video standard.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-04 06:35:17 +02:00
Mans Rullgard
5e1166b31b Mark some variables with av_unused 
Most of these variables are only used in av_dlog statements, some
are required but not used by other macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-03 12:59:05 +01:00
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Clément Bœsch
adba9c6352 Fix various unused variable warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 00:24:01 +02:00
Reuben Thomas
39d983461a Add reading of disc number to mov.c 2011-05-25 11:15:56 +02:00
Michael Niedermayer
f455f46455 movdec: dont divide by zero when stts_data[0].duration = 0. 
Fixes ticket223
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 21:31:28 +02:00
Michael Niedermayer
e6e7ba0ce3 Add some forgotten const to function arguments in libavfilter & libavformat. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-17 03:05:36 +02:00
Carl Eugen Hoyos
d2549ba9df Fix some mov files with little endian audio (tickets 201 - 203). 2011-05-17 01:17:27 +02:00
Michael Niedermayer
72153419b5 Merge remote branch 'qatar/master' 
* qatar/master: (33 commits)
  rtpdec_qdm2: Don't try to parse data packet if no configuration is received
  ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
  ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
  mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
  srtdec: make sure we don't write past the end of buffer
  wmaenc: improve channel count and bitrate error handling in encode_init()
  matroskaenc: make sure we don't produce invalid file with no codec ID
  matroskadec: check that pointers were initialized before accessing them
  lavf: fix function name in compute_pkt_fields2 av_dlog message
  lavf: fix av_find_best_stream when providing a wanted stream.
  lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
  ffmpeg: factorize quality calculation
  tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
  tiff: Prefer enum TiffCompr over int for TiffContext.compr.
  mov: Support edit list atom version 1.
  configure: Enable libpostproc automatically if GPL code is enabled.
  Cosmetics: fix prototypes in oggdec
  oggdec: fix memleak with continuous streams.
  matroskaenc: add missing new line in av_log() call
  dnxhdenc: add AVClass in private context.
  ...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
	configure
	ffmpeg.c
	libavformat/matroskaenc.c
	libavutil/pixfmt.h
	libswscale/ppc/swscale_template.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/fate/h264.mak
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_copy_le
	tests/ref/lavfi/pixfmts_null_le
	tests/ref/lavfi/pixfmts_scale_le
	tests/ref/lavfi/pixfmts_vflip_le

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-13 04:40:40 +02:00
Yusuke Nakamura
5f0bb0baef mov: Support edit list atom version 1. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-12 15:52:25 +02:00
Michael Niedermayer
e5a85164b1 Merge remote branch 'qatar/master' 
* qatar/master:
  mov: fix composition timestamps on movie fragments.
  wmavoice: Use proper size in memeset().
 2011-05-07 04:14:09 +02:00
Yusuke Nakamura
45a811b512 mov: fix composition timestamps on movie fragments. 
This fixes, for instance, the case that there is a track that has some samples with composition time offset and has a track run without sample-composition-time-offsets-present.
 2011-05-05 22:07:54 -07:00
Reimar Döffinger
148ffcd2ce Make DV (sub) demuxer set proper pkt->pos values. 
This makes the avi demuxer create packets with proper pos values
with the file from ticket #140.
 2011-05-02 18:38:01 +02:00
Reimar Döffinger
543f3db978 Read the album_artist, grouping and lyrics metadata. 
Our muxer writes these out, so we really should support reading them.
Fixes ticket #30.
 2011-04-30 11:02:49 +02:00
Carl Eugen Hoyos
2d8d6882a7 Read channel layout atom in mov files. 2011-04-28 10:47:40 +02:00
Michael Niedermayer
7b376b398a Merge remote branch 'qatar/master' 
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 03:41:22 +02:00
Alex Converse
3583d7cffe Fix mov debug (u)int64_t format strings. 2011-04-22 20:36:12 -07:00
Michael Niedermayer
efb5fa79f5 Merge remote branch 'qatar/master' 
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-20 04:48:23 +02:00
Stefano Sabatini
59d96941f0 avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols 
Make AVIO_FLAG_ access constants work as flags, and in particular fix
the behavior of functions (such as avio_check()) which expect them to
be flags rather than modes.

This breaks API.
 2011-04-19 19:47:58 +02:00
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master' 
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:43:54 +02:00
Kostya Shishkov
2d8591c27e make containers pass palette change in AVPacket 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-15 18:02:05 +02:00
Michael Niedermayer
c88caa522c Merge remote branch 'qatar/master' 
* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-08 02:50:13 +02:00
Anton Khirnov
f87b1b373a avio: AVIO_ prefixes for URL_ open flags. 2011-04-07 18:07:16 +02:00
Michael Niedermayer
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
Anton Khirnov
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
Michael Niedermayer
19457a5d4a Fix issue2246 
ignore last ctts duration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 16:40:12 +02:00
Michael Niedermayer
7ac167493e Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  mpegts: propagate avio EOF in read_packet()
  configure: Initial support for --target-os=symbian
  Fixed-point FFT and MDCT
  Include dependencies for test programs
  ac3enc: simplify sym_quant()
  flvdec: read index stored in the 'keyframes' tag.
  mov: Add support for zero-sized stsc runs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 02:58:15 +02:00
Alex Converse
9dd94f8379 mov: Add support for zero-sized stsc runs. 
A zero sized stsc run doesn't make a lot of sense but the spec does not
prohibit them and MPlayer VLC demuxers support them.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-31 07:28:20 +02:00
Michael Niedermayer
27ef7b1bcd Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
  Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
  Use audio_service_type to set stream disposition.
  Add APIchanges entry for audio_service_type.
  Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
  configure: in check_ld, place new -l flags before existing ones
  support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
  doc: update build system documentation
  aacenc: indentation
  aacenc: fix the side calculation in search_for_ms
  vp8.c: rename EDGE_* to VP8_EDGE_*.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-26 03:06:30 +01:00
Justin Ruggles
eb81cf860c mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. 2011-03-25 16:59:09 -04: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
db44ea960d avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
 2011-03-08 02:09:21 +01: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
76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Michael Niedermayer
4118d66cb3 Revert "lavf: deprecate get_strz() in favor of avio_get_str" 
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.

This reverts commit 773947ba76.
 2011-03-06 02:16:00 +01: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
773947ba76 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e16ead0716)
 2011-03-05 02:29:28 +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
e16ead0716 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:02 -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
ebb92e0768 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32)
 2011-02-23 18:22:03 +01:00
Anton Khirnov
22a3212e32 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 10:18:55 -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
ae99313aa5 avio: move init_put_byte() to a new private header and rename it 
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e731b8d872)
 2011-02-20 19:05:47 +01: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
e731b8d872 avio: move init_put_byte() to a new private header and rename it 
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:31 -05: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
Mans Rullgard
5e81cb580a mov: remove stray semicolon 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 628b16f45f)
 2011-02-11 02:54:09 +01:00
Mans Rullgard
628b16f45f mov: remove stray semicolon 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-10 14:17:24 +00:00
Sascha Sommer
e11afd71a3 pass QDMC extradata to the decoder 
Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ed19fafd48)
 2011-02-09 03:30:01 +01:00
Sascha Sommer
ed19fafd48 pass QDMC extradata to the decoder 
Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 16:05:55 -05:00
Luca Barbato
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
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
John Stebbins
2f7d8977bc mov: add support for little-endian utf16 chapter names 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 97b04f5ed3)
 2011-01-28 03:15:35 +01: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
Anton Khirnov
ebf3ee16c7 mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 225b6d7fde)
 2011-01-28 03:15:34 +01:00
Mans Rullgard
bc1aebcd07 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be" 
This reverts commit c34461b35b.
The wrong version of the patch was committed.
(cherry picked from commit c4f8765ac5)
 2011-01-28 03:15:34 +01:00
John Stebbins
97b04f5ed3 mov: add support for little-endian utf16 chapter names 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 01:06:57 +01:00
Baptiste Coudurier
f258964217 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 01:06:57 +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
Anton Khirnov
225b6d7fde mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 22:03:21 +00:00
Mans Rullgard
c4f8765ac5 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be" 
This reverts commit c34461b35b.
The wrong version of the patch was committed.
 2011-01-26 22:03:21 +00:00
Anton Khirnov
0c468f5684 mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c34461b35b)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
c34461b35b mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Baptiste Coudurier
d4e0130e46 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it. 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
 2011-01-24 14:20:48 -08:00
Baptiste Coudurier
c3024f9e7e In mov demuxer, handle better wrong time scale, fix issue #2528 
Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 21:06:37 +00:00
Baptiste Coudurier
f6253caf8b In mov demuxer, set r_frame_rate for cfr files 
Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 19:58:00 +00:00
Baptiste Coudurier
5e2202d6f3 In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490 
Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:21:04 +00:00
Baptiste Coudurier
4af7166fb4 In mov demuxer, check that stts data exists, fix crash, issue #2479 
Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:14:44 +00:00
Baptiste Coudurier
c6f1e29a15 In mov demuxer, read alac sample from extradata, fix #2406 
Originally committed as revision 25901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 01:38:26 +00:00
Baptiste Coudurier
adc7305424 In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069 
Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 05:03:29 +00:00
Baptiste Coudurier
798c6facb7 In ts demuxer, support aac flexmux using extradata in iods, issue #2346 
Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 00:51:12 +00:00
Aurelien Jacobs
7df2214328 movdec: export creation_date as metadata 
Originally committed as revision 25786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 19:02:52 +00:00
Baptiste Coudurier
2b91d83ef3 In mov demuxer, export .mov encoder metadata tag 
Originally committed as revision 25757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-16 05:55:09 +00:00
Martin Storsjö
2f412421e8 movdec: Free the previous extradata 
If multiple stsd atoms are parsed for the same stream, the old
extradata would be leaked.

Originally committed as revision 25360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:36:30 +00:00
Martin Storsjö
dc2cabd003 movdec: Split out ff_mov_read_stsd 
Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:35:44 +00:00
Baptiste Coudurier
6d19fd5c26 In mov demuxer, check that nb_streams is valid before using it in read_dac3 
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-28 00:33:21 +00:00
Baptiste Coudurier
0e7d436d92 Check dref size based on a patch by google 
Originally committed as revision 25081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:20:24 +00:00
Baptiste Coudurier
9044dd8399 In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539 
Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:18:14 +00:00
Justin Ruggles
bdecdd2bfc Read the number of channels from the 'dac3' tag for AC-3 in MP4. 
Originally committed as revision 25054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-06 21:52:11 +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
David Conrad
105b37859b mov: Read Flash's chpl variant 
This is based off of F4V specs rather than any actual files

Originally committed as revision 24035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-04 04:59:12 +00:00
John Stebbins
380966a801 In mov demuxer, fix seeking to the beginning when file has edit lists. 
Patch by John Stebbins, stebbins at jetheaddev dot com
Fixes issue #2046

Originally committed as revision 23966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 08:24:37 +00:00
Andrew Wason
525fcb2798 In mov demuxer, only set sar if not already set, patch by Andrew Wason, 
rectalogic at rectalogic dot com
Fixes issue #1754

Originally committed as revision 23948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 23:18:27 +00:00
Baptiste Coudurier
7d6096e42e Use ext sample from mpeg4audio config if set with AAC SBR 
Originally committed as revision 23947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 22:31:31 +00:00
Baptiste Coudurier
2209ffacb9 In mov demuxer, increase total size after debugging message 
Originally committed as revision 23864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 21:02:16 +00:00
Baptiste Coudurier
3491866a4b Improve mov atom parsing debug message, print parent atom and size in decimal 
Originally committed as revision 23764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-25 01:19:03 +00:00
Baptiste Coudurier
ea4c4d7fe3 change author metadata to artist in mov de/muxer 
Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 21:03:14 +00:00
David Conrad
1cf9f6ed4f mov: Read nero chapters 
Originally committed as revision 23020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 08:41:01 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
David Conrad
7221579b0c mov: Read QuickTime chapters 
Originally committed as revision 22928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 06:36:09 +00:00
Martin Storsjö
653d7aeb61 Parse strf mov atoms 
This fixes roundup issue 1270.

Originally committed as revision 22894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 20:36:24 +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
Baptiste Coudurier
08a186c648 In mov demuxer, convert mac encoded strings to utf-8 
Originally committed as revision 22365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 01:03:42 +00:00
Baptiste Coudurier
987e857f63 Preallocate index entries in mov demuxer, huge speedup 
Originally committed as revision 22363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 00:46:26 +00:00
Carl Eugen Hoyos
998257bd4f Make mp4_read_descr static: It is only used inside libavformat/mov.c. 
Originally committed as revision 22097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 01:51:13 +00:00
Michael Niedermayer
bbdf0d2214 Make sure we dont write more bytes into filename than the array is long. 
just a precaution in case the size of the source array is increased or
made dynamically allocateable.

Originally committed as revision 21926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 22:57:23 +00:00
Michael Niedermayer
6a2459059e Do not attempt to open references through absolute pathes. 
This would allow an attacker to test remotely if a local file exists.

Originally committed as revision 21925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 22:48:09 +00:00
Anton Khirnov
ca76a11948 Add a list of generic tags and change demuxers to follow it. 
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-01 11:39:10 +00:00
Carl Eugen Hoyos
895a9be60c Force codec_tag I420 for Quicktime Planar Y'CbCr 8-bit 4:2:0 raw codec, 
because YV12 triggers an UV swap in rawdec.c, fixes issue 1687.

Originally committed as revision 21436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-24 21:37:35 +00:00
Baptiste Coudurier
49c43fc278 reindent 
Originally committed as revision 21311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:58:10 +00:00
Baptiste Coudurier
c3aeaa540d set average frame rate in mov demuxer 
Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:56:04 +00:00
Baptiste Coudurier
c956611527 move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4 
Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 21:38:39 +00:00
Andrew Wason
ff5ab5c8c9 set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com 
Fixes issue 671.

Originally committed as revision 21210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-14 00:32:36 +00:00
Baptiste Coudurier
49544546b0 do not skip mdat data if it's the last atom, avoids one seek 
Originally committed as revision 21209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 23:33:29 +00:00
Baptiste Coudurier
7b1312fa55 cosmetics, remove useless parentheses, add space 
Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:59:43 +00:00
Baptiste Coudurier
a510991cff simplify error handling in mov_read_default 
Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:58:19 +00:00
Baptiste Coudurier
cb41b2b6e0 remove no more needed MOVAtom.offset field 
Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:51:38 +00:00
Baptiste Coudurier
7ead7e2181 remove useless code skipping data at end of hdlr atom, already done in mov_read_default 
Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:48:27 +00:00
Jai Menon
6866dd1237 Fix typo. 
Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 13:10:56 +00:00
David Conrad
b9c78bca26 MOV: cprt is another tag used for copyright 
Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 08:47:47 +00:00
David Conrad
7382902b86 MOV: Add several iTunes metadata tags 
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 08:47:44 +00:00
Baptiste Coudurier
e26df9ebf1 use AVFormatContext in dprintf 
Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 21:03:25 +00:00
Baptiste Coudurier
adeb907137 Search relative path according to alias record when opening mov reference files. 
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv

Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-15 03:26:47 +00:00
Alex Converse
ba278391ba Debug print MP4 objectTypeIndication in hex not decimal as values are listed in 
hex in all official documents.

Originally committed as revision 20523 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-12 02:22:19 +00:00
Alex Converse
5aea268d14 Add a channels field to MPEG4AudioConfig. 
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-11 20:24:23 +00:00
Baptiste Coudurier
a4cb56aaf4 change \0xa9enc tag metadata name to encoder to match id3v2 
Originally committed as revision 20469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-06 18:59:25 +00:00
Baptiste Coudurier
bddc2df52e 10l, typo 
Originally committed as revision 20462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 08:53:05 +00:00
Baptiste Coudurier
c2564699bf do not redundantly set stream nb_frames, it's already set in read_stts 
Originally committed as revision 20459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:32:50 +00:00
Baptiste Coudurier
e745272196 compute dts shift with ctts value, cslg atom might be missing, fix #419 
Originally committed as revision 20458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:30:53 +00:00
Baptiste Coudurier
fedb1eca07 check that duration is set to avoid fpe 
Originally committed as revision 20457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:17:10 +00:00
Baptiste Coudurier
507330b9d3 warn if stream timescale is not set and set it to 1 to avoid FPE 
Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:11:54 +00:00
Baptiste Coudurier
55d2e32a40 fix \0xa9wrt metadata, to composer, fix issue #1501 
Originally committed as revision 20453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 01:40:13 +00:00
haim alon
c5898e8623 compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com 
Originally committed as revision 20368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-24 20:40:00 +00:00
Reimar Döffinger
f2ad907060 10l in code reading codec_name, the first byte is the length and should not 
become part of the string.

Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 18:27:39 +00:00
Reimar Döffinger
19635234b1 Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg 
must be valid UTF-8.

Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 09:43:56 +00:00
Baptiste Coudurier
a42bf19134 100l, typo 
Originally committed as revision 20033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 21:06:18 +00:00
haim alon
7b5252ce3e Export mov/mp4 major and compatible brands as metadata. 
Patch by haim alon, haim dot alter at gmail dot com

Originally committed as revision 20032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 20:51:38 +00:00
Peter Ross
2d423666c0 Make mov LPCM and AAC parsing functions public 
Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 11:35:01 +00:00
Baptiste Coudurier
e4bc8af1e6 check entries against field_size, potential malloc overflow in read_stsz, fix #1357 
Originally committed as revision 19793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-07 22:42:51 +00:00
Baptiste Coudurier
1c4bf2ec37 add one missing check for stream existence in read_elst, fix #1364 
Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-07 22:36:33 +00:00
Baptiste Coudurier
d862fce758 only set par if it does not indicates a rotation, ex iphone 3GS 
Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-25 00:17:47 +00:00
Reimar Döffinger
e1c1b0ff09 Reindent after last patch. 
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 09:40:00 +00:00
Reimar Döffinger
3fe4d5d4e6 mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set. 
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.

Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 09:38:42 +00:00
Reimar Döffinger
5dc5c43bda mov_read_packet: extract code that searches for the stream/sample to demux next 
into a separate function.

Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:57:53 +00:00
Reimar Döffinger
a2f3851166 mov_read_packet: if dv_get_packet fails, return exactly its error value 
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).

Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:50:46 +00:00
Reimar Döffinger
69fc436cbc In mov_read_packet remember the AVStream we want to demux next instead of the 
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.

Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:23:40 +00:00
Baptiste Coudurier
6a63ff19b6 check stream existence before assignment, fix #1222 
Originally committed as revision 19259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 03:38:47 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h. 
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 23:09:34 +00:00
Baptiste Coudurier
53e099de8b check atom size against edit_count to avoid very long loop 
Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-15 02:07: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
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
281551131d broken stsd length might be < 16, fix elst-assert.mp4 
Originally committed as revision 19084 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-03 23:13:53 +00:00
Baptiste Coudurier
7e69621f56 split audio chunks in mov demuxer 
Originally committed as revision 19018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 04:36:26 +00:00
Baptiste Coudurier
350f2c2cef return AVERROR_EOF 
Originally committed as revision 18992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-30 06:15:27 +00:00
Baptiste Coudurier
2d5fabc87a move increment after debug print 
Originally committed as revision 18851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-16 04:08:34 +00:00
Baptiste Coudurier
171a353159 parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop 
Originally committed as revision 18813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-13 08:31:22 +00:00
Baptiste Coudurier
41e6499996 remove comment 
Originally committed as revision 18811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-13 07:57:08 +00:00
Baptiste Coudurier
4b29ed399f Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative. 
We have now dts <= pts, note that for some B frames dts+1 == pts can happen
if a crappy timebase is used instead of correct /1001.

Originally committed as revision 18810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-13 07:55:03 +00:00
Jai Menon
b24bbbb4da Introduce codec id for MPEG-4 ALS and associate it with corresponding 
AudioObjectType. Also bump libavcodec minor version.

Originally committed as revision 18591 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:17:14 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Baptiste Coudurier
17ad7b24c8 force sample for qcelp when not stored in mov, fix #968 
Originally committed as revision 18374 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 03:38:59 +00:00
Reimar Döffinger
3dd3604197 Reindent 
Originally committed as revision 18315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 11:27:14 +00:00
Reimar Döffinger
fb9ac65411 Support DVD subtitles in mov/mp4 as created by Nero. 
See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4

Originally committed as revision 18314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 11:26:46 +00:00
Baptiste Coudurier
f03a081df0 set wrong_dts for iMovie created files which has huge ctts delay, fix ffmpeg_sample.m4v 
Originally committed as revision 18181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-25 06:07:13 +00:00
Ronald S. Bultje
2121b160d5 Remove alpha channel from default colorspace tables, since it is unused. See 
"qtpalette.h" thread on mailinglist.

Originally committed as revision 18144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 13:05:13 +00:00
Baptiste Coudurier
08a5b4e9b5 since code now use get_bits_long, allocate padding buffer 
Originally committed as revision 18138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 02:47:35 +00:00
Baptiste Coudurier
a0dd3c0039 reset codec width/height for h264 forcing decoder to parse extradata 
Originally committed as revision 18134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 23:29:34 +00:00
Alex Converse
5c3d507f1a MOV: Use the AOT enum for the mp4_audio_types mapping. 
Originally committed as revision 18044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 18:13:42 +00:00
Reimar Döffinger
2ac736a6da Extend mov edit list support to work for a first padding entry with 
time == -1 and duration. Complicated since time is relative to stream,
duration relative to container time base.

Originally committed as revision 18019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 20:49:52 +00:00
Alex Converse
d0dab0ecd4 Cosmetics: Re-indent after last commit 
Originally committed as revision 18017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 16:24:38 +00:00
Alex Converse
bd27eed6d0 MOV: Support stz2 "Compact Sample Size Box" 
Originally committed as revision 18016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 16:14:36 +00:00
Baptiste Coudurier
f05783c2db cosmetics, remove useless braces 
Originally committed as revision 18004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:46:57 +00:00
Baptiste Coudurier
9bf1b2683c simplify printing 
Originally committed as revision 18003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:46:28 +00:00
Baptiste Coudurier
f584386d54 reindent 
Originally committed as revision 18002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:44:16 +00:00
Baptiste Coudurier
c6026e4360 fix trkn metadata parsing 
Originally committed as revision 18001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:43:38 +00:00
Baptiste Coudurier
0fb44a4e47 move read_udta_string up to avoid forward declaration 
Originally committed as revision 18000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:06:05 +00:00
Baptiste Coudurier
873358e5d4 more generic metadata handling 
Originally committed as revision 17999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:03:29 +00:00
Baptiste Coudurier
2229a5c60e do not set isom if ctype is not set, happens in mov 
Originally committed as revision 17998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 05:13:55 +00:00
Baptiste Coudurier
df8843c65f search for hdlr atom in meta, some files do not store version+flags 
Originally committed as revision 17996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 23:54:53 +00:00
Baptiste Coudurier
7c4502c8c4 typo in the mail, the 4am commit is always the worst 
Originally committed as revision 17981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 10:53:12 +00:00
Baptiste Coudurier
983bdd3788 add my copyright in mov de/muxer 
Originally committed as revision 17979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 10:49:28 +00:00
Baptiste Coudurier
e49da8273b allocate palette in codec directly 
Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 09:44:57 +00:00
Baptiste Coudurier
6c00a9dec2 cosmetics, add some whitespaces and empty lines 
Originally committed as revision 17975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 09:06:36 +00:00
Baptiste Coudurier
f0f2218dce do not modify sample_count, check against index entries 
Originally committed as revision 17972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 07:21:22 +00:00
Ronald S. Bultje
88c4339bda Move MOVContext and related structures from mov.c to isom.h. See "[PATCH] 
move MOVContext from mov.c to isom.h" thread on ML.

Originally committed as revision 17915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 21:53:00 +00:00
Alex Converse
63581eb183 MOV: fix demuxing fragmented files 
Originally committed as revision 17803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-04 07:57:09 +00:00
Alex Converse
fefe43ff2c MOV: fix crash when 'meta' occurs before first 'trak' 
Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 18:19:44 +00:00
Aurelien Jacobs
bc718b4720 fix missed usage of old metadata API in mov demuxer 
Originally committed as revision 17689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 16:06:26 +00:00
Benoit Fouet
f3592353ce Add a context to av_log() call. 
Originally committed as revision 17638 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 08:31:20 +00:00
Baptiste Coudurier
bc64cb9680 check av_get_packet return value 
Originally committed as revision 17514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 01:07:46 +00:00
Baptiste Coudurier
0d8f0abfb9 return AVERROR(ENOMEM) if alloc failed, set count after alloc, use variable when reallocing, based on patch by Netgem 
Originally committed as revision 17509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 00:20:07 +00:00
Aurelien Jacobs
54b4ea57fd demux some more metadata tags in mov 
Originally committed as revision 17321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 14:13:28 +00:00
Aurelien Jacobs
49674dd052 use new metadata API in mov demuxer 
Originally committed as revision 17309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 02:28:54 +00:00
Baptiste Coudurier
5b4f5e5dff fix frame size, time rate is not stts duration anymore with time offset 
Originally committed as revision 17162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 21:11:19 +00:00
Baptiste Coudurier
fcdd622cfc do not set start time to 0, it is not the case with elst time offset 
Originally committed as revision 17161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 20:19:35 +00:00
Baptiste Coudurier
a5929abe7a adjust time rate according to elst time offset 
Originally committed as revision 17146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 02:32:39 +00:00
Baptiste Coudurier
4c125b8f6e fix compilation with DEBUG defined, field does not exist anymore 
Originally committed as revision 17115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 02:27:26 +00:00
Baptiste Coudurier
04e06cfa20 cosmetics: sample_to_chunk -> stsc 
Originally committed as revision 17054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:59:31 +00:00
Baptiste Coudurier
a234e38d6e cosmetics: sample_to_ctime -> ctts 
Originally committed as revision 17053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:57:28 +00:00
Baptiste Coudurier
1975c52c2a remove useless field 
Originally committed as revision 17052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:55:23 +00:00
Baptiste Coudurier
425c9962b2 fix doxygen 
Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:39:19 +00:00
Stefano Sabatini
8e2fd8e1d4 Replace the calls to the deprecated av_alloc_format_context() with 
corresponding calls to avformat_alloc_context().

Originally committed as revision 17048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 08:27:26 +00:00
Baptiste Coudurier
baf2ffd329 offset dts according to edit list, hackish but works, based on patch by Reimar 
Originally committed as revision 17037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 04:27:07 +00:00
Baptiste Coudurier
bf252f7f6f prevent reading more than container atom size, fix broken file broken_by_rev15830.MOV, fix #818 
Originally committed as revision 16979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 23:03:41 +00:00
Baptiste Coudurier
8dc81a4524 seek at 0 when timestamp requested is negative 
Originally committed as revision 16815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 04:29:33 +00:00
Aurelien Jacobs
dce25564cc 'code' is used to index a table so make it unsigned 
this prevents using negative index and possibly crashing with broken files

Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-21 22:32:17 +00:00
Baptiste Coudurier
f53ee31275 change sample aspect ratio test to be more clear, print old one 
Originally committed as revision 16703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 21:06:57 +00:00
Diego Biurrun
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
Aurelien Jacobs
9ce6c13879 export gcd function as av_gcd() 
Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 11:13:33 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
David Conrad
6cdbff63cd Use the dimensions in tkhd for timed text tracks 
Originally committed as revision 16561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 23:24:28 +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
Baptiste Coudurier
64d50fa551 move ffindex set before mov_read_default so it can be used in functions 
Originally committed as revision 16548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:04:25 +00:00
David Conrad
58e9f2edb6 Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text 
Originally committed as revision 16530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 08:24:44 +00:00
Baptiste Coudurier
fa50a0276f only set le if value is 1, fix boom5.mov, issue #770 
Originally committed as revision 16507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 22:13:37 +00:00
Baptiste Coudurier
364df7b7b9 cosmetics, remove useless parenthesis and whitespaces 
Originally committed as revision 16213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:18:43 +00:00
Baptiste Coudurier
a15328249d set alac channels from extradata, fix alac mono in m4a 
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:17:19 +00:00
Baptiste Coudurier
271344377a check that nb_streams is valid before setting stream, fix crash with jp2 which do not use same structure 
Originally committed as revision 16166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 08:47:28 +00:00
Baptiste Coudurier
6da5407401 parse pasp atom and set sample aspect ratio, 
warn if transformation matrix differs from pasp,
based on a patch by Skal.

Originally committed as revision 16066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 22:24:56 +00:00
Baptiste Coudurier
c3e92a6cb4 remove _t in typedef for POSIX compatibility 
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 20:06:56 +00:00
Kenan Gillet
73b458e354 Commit last ok'ed parts of QCELP decoder and enable it. 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-02 16:48:05 +00:00
Kenan Gillet
061f407e53 More OKed parts of the QCELP decoder 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-01 22:07:00 +00:00
Baptiste Coudurier
12e416c848 decrease atom size, fix broken files missing version/flags 
Originally committed as revision 15872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-18 09:09:57 +00:00
Baptiste Coudurier
51c1520114 read itunes metadata, code based on Reimar's patch 
Originally committed as revision 15840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-16 01:59:35 +00:00
Baptiste Coudurier
86b0affd08 simplify metadata reading 
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:17:19 +00:00
Baptiste Coudurier
5b9ce252a9 10l, fix amrwb sample rate 
Originally committed as revision 15562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 23:30:35 +00:00
Baptiste Coudurier
f06188d5ee set sample rate for amr to allow stream copy since no decoder is present, 
3gp does not store sample rate in stsd in fact. Fixes #674.

Originally committed as revision 15536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 19:37:41 +00:00
Diego Biurrun
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
Diego Pettenò
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
Baptiste Coudurier
0c5f76f708 support negative ctts in some way, unset wrong dts 
Originally committed as revision 15468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 02:44:57 +00:00
Baptiste Coudurier
4e240985d8 stop parsing if tag size is wrongly < 8 to avoid infinite loop 
Originally committed as revision 15401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 18:55:00 +00:00
Baptiste Coudurier
aeb627888d merge amr wb case with amr nb and qcelp 
Originally committed as revision 15399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:17:11 +00:00
Baptiste Coudurier
26f5e1469f do not override sample rate for amr nor qcelp, should fix some qcelp files at 16000hz 
Originally committed as revision 15397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:09:59 +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
Baptiste Coudurier
3a25c707fa remove vorbis dec hack, decoding will be done anyway to get frame size 
Originally committed as revision 15035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-29 20:04:28 +00:00
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to 
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 23:43:20 +00:00
Baptiste Coudurier
7e4b3fb878 enable fl32/64 le/be in mov with stsd audio v2 
Originally committed as revision 14919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 15:25:38 +00:00
Peter Ross
a1ef2c4bb3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio. 
Originally committed as revision 14836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 11:00:40 +00:00
Baptiste Coudurier
021b8ae39b fix if/else case 
Originally committed as revision 14526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 21:24:30 +00:00
Baptiste Coudurier
2288834f87 full lpcm support in mov audio stsd v2 
Originally committed as revision 14524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 18:37:35 +00:00
Baptiste Coudurier
aaef2bb345 support big endian lpcm with audio stsd v2 
Originally committed as revision 14507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:45:23 +00:00
Baptiste Coudurier
6b477e1b71 keep original codec/fourcc endianness, fix XDCAMHD.mov 
Originally committed as revision 14506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:43:36 +00:00
Baptiste Coudurier
9184d53a03 more complete audio stsd v2 
Originally committed as revision 14505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:40:13 +00:00
Baptiste Coudurier
5ef3ad59f2 move version specific parsing code before codec specific code, will be needed 
Originally committed as revision 14504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:35:43 +00:00
Art Clarke
138568e9da downgrade mov negative ctts log message to warning, patch by Art Clarke, aclarke at vlideshow dot com 
Originally committed as revision 14492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 19:44:42 +00:00
John Schmiederer
ec072669f7 Use tkhd matrix for proper display in mov. 
Patch by John Schmiederer jschmiederer on2 com
Original thread: [PATCH] Use tkhd matrix for proper display in mov
Date: 05/23/2008 09:31 PM

Originally committed as revision 14365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-24 07:55:11 +00:00
Baptiste Coudurier
5469b788ea cosmetics, remove space 
Originally committed as revision 14273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-18 00:24:31 +00:00
Baptiste Coudurier
40e7aaa384 Return max score when ftyp atom is encountered. 
Originally committed as revision 14272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-18 00:23:37 +00:00
Baptiste Coudurier
d4fdba0df7 chinese avs demuxing support, demux AVSFileFormat.mp4 
Originally committed as revision 13899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 23:52:57 +00:00
Baptiste Coudurier
ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream 
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-20 17:22:56 +00:00
Art Clarke
e3ec60d82a free private streamcontext when closing demuxer, fix memory leak, patch by Art Clarke, aclarke at vlideshow dot com 
Originally committed as revision 13800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 08:30:50 +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
Baptiste Coudurier
391872e467 aac chan config is 0 if bitstream contains program_config_element 
Originally committed as revision 13437 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 21:52:54 +00:00
Albert Astals Cid
6f04eb1e8a free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es 
Originally committed as revision 13237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 17:16:12 +00:00
Baptiste Coudurier
585dac65db only print debug info when sample is actually added 
Originally committed as revision 13202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:24:02 +00:00
Baptiste Coudurier
285a3da9bd warn about multiple fourcc 
Originally committed as revision 13201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:22:44 +00:00
Baptiste Coudurier
978677a779 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451 
Originally committed as revision 13200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:21:29 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Henrik Gulbrandsen
e8430214c3 set pkt duration, only when dts == pts though, 
patch by Henrik Gulbrandsen henrik at gulbra dot net

Originally committed as revision 13003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 17:51:02 +00:00
Baptiste Coudurier
eb034aca18 yes it is true for mp4 
Originally committed as revision 12972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:52:30 +00:00
Baptiste Coudurier
43612ffe25 remove unneeded variable 
Originally committed as revision 12971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:50:06 +00:00
Baptiste Coudurier
baf9fb32c0 move vars decls where vars are used 
Originally committed as revision 12970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:47:22 +00:00
Baptiste Coudurier
45a97d3018 set channels and sample rate from mpeg4audio config 
Originally committed as revision 12964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 14:09:42 +00:00
Baptiste Coudurier
1dec399449 parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files 
Originally committed as revision 12961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 14:03:28 +00:00
Baptiste Coudurier
69b1c62756 update doc 
Originally committed as revision 12960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:56:08 +00:00
Baptiste Coudurier
7e6273322c error is -1 
Originally committed as revision 12959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:54:33 +00:00
Baptiste Coudurier
cfb5a2abcb cosmetics 
Originally committed as revision 12958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:45:46 +00:00
Baptiste Coudurier
47e1d7efce move vars decls where vars are used 
Originally committed as revision 12957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:44:34 +00:00
Baptiste Coudurier
8cd92bb915 parser should not be needed anymore, merge cases and set frame size for amr too 
Originally committed as revision 12956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:34:51 +00:00
Baptiste Coudurier
3b8c000d1e lower frame size to split amr/qcelp/gsm frames 
Originally committed as revision 12954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:24:25 +00:00
Baptiste Coudurier
37ffe34bf3 align and remove useless braces 
Originally committed as revision 12952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 12:02:01 +00:00
Baptiste Coudurier
1c126b4f38 cosmetics, remove whitespaces in tags 
Originally committed as revision 12951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 11:57:39 +00:00
Baptiste Coudurier
cc326d2bf3 set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov 
Originally committed as revision 12950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 10:35:06 +00:00
Baptiste Coudurier
3f78a3a955 demux qcelp, so this can work with soc decoder and stream copy 
Originally committed as revision 12941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 17:17:41 +00:00
Baptiste Coudurier
be51192502 set alac frame size from extradata 
Originally committed as revision 12937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 13:58:22 +00:00
Michael Niedermayer
7344dac4ad Fix probe for mov00003.mqv. 
Originally committed as revision 12833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-15 12:25:03 +00:00
Baptiste Coudurier
0265fe81e4 remove cast 
Originally committed as revision 12757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-05 12:47:56 +00:00
Baptiste Coudurier
612b5cbb24 better error message 
Originally committed as revision 12756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-05 12:46:59 +00:00
Baptiste Coudurier
5e788d588b support mp4 fragmented files without any samples in the moov atom 
Originally committed as revision 12635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-30 21:15:06 +00:00
Baptiste Coudurier
44e43aab03 check frag track id before setting st 
Originally committed as revision 12634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-30 20:49:29 +00:00
Baptiste Coudurier
5610f20ed4 gsm in mov, demux surge-1-16-B-agsm.mov 
Originally committed as revision 12621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 16:30:22 +00:00
Baptiste Coudurier
9e81a0ce00 print essence path in error message 
Originally committed as revision 12607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:30:31 +00:00
Baptiste Coudurier
9ce84dd8b4 cosmetics, useless braces 
Originally committed as revision 12606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:20:12 +00:00
Baptiste Coudurier
6282c5f45b print stream index in error message 
Originally committed as revision 12605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:19:19 +00:00
Baptiste Coudurier
71f3623510 according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov 
Originally committed as revision 12604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:16:29 +00:00
Baptiste Coudurier
d3bc61ac75 Only use chunk demuxing for old uncompressed audio mechanism specified by stts. 
This will split amr/aac cbr samples correctly in isom files which do not
set audio cid to -2.

Originally committed as revision 12603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 12:35:22 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred 
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 01:06:57 +00:00
Baptiste Coudurier
48a5529016 sample size to 1 might happen for data, fix GMCMidiaASX.mov, fallback is better than failing 
Originally committed as revision 12547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 14:30:45 +00:00
Baptiste Coudurier
433aeb6240 support fragments when non streamable 
Originally committed as revision 12542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 13:43:19 +00:00
Baptiste Coudurier
61aedb0f56 mp4 fragments support 
Originally committed as revision 12541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 13:40:23 +00:00
Baptiste Coudurier
117a9190cd cosmetics, split or move too long lines 
Originally committed as revision 12536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 11:16:16 +00:00
Baptiste Coudurier
db3ee6cc96 simplify, and only stop parsing when non streamable 
Originally committed as revision 12534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 11:04:54 +00:00
Baptiste Coudurier
bb787a93dd atoms are not mp4 only, and yes probe is sufficient 
Originally committed as revision 12532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 10:52:14 +00:00
Baptiste Coudurier
9c55b7725b update description 
Originally committed as revision 12531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 10:51:12 +00:00
Baptiste Coudurier
3efe8848fc return ENOMEM 
Originally committed as revision 12530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 10:48:22 +00:00
Baptiste Coudurier
2922cbdb14 cannot free AVStream like this, and return ENOMEM 
Originally committed as revision 12529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 10:47:14 +00:00
Baptiste Coudurier
e3c4740fd4 indentation 
Originally committed as revision 12528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 10:39:49 +00:00
Baptiste Coudurier
eb61405a07 remove useless debug print since now mov_build_index will do 
Originally committed as revision 12516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 16:07:55 +00:00
Baptiste Coudurier
f9900374ec free track data asap 
Originally committed as revision 12515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 16:00:45 +00:00
Baptiste Coudurier
1e77810d3b move mov_build_index before mov_read_trak to avoid useless declaration 
Originally committed as revision 12514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 15:57:11 +00:00
Baptiste Coudurier
bd991df2a7 move specific end treatment when trak is detected, will be needed for fragments 
Originally committed as revision 12513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 15:55:50 +00:00
Baptiste Coudurier
23f0861715 simplify, flags is 24bits according to specs 
Originally committed as revision 12460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 15:13:40 +00:00
Diego Biurrun
7ce6892373 misc spelling fixes 
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 18:42:09 +00:00
Baptiste Coudurier
0de2157fa4 set codec bps to grayscale bits, fix 256grey.mov 
Originally committed as revision 12272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-28 16:05:19 +00:00
Baptiste Coudurier
da00a1bdf4 add weird first atom to probe, finally fix bartjones.mov 
Originally committed as revision 12265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 12:24:27 +00:00
Baptiste Coudurier
dbb3765779 free in case of multiple type == 2 
Originally committed as revision 12263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 09:31:41 +00:00
Baptiste Coudurier
2f4568e525 return error if malloc fails 
Originally committed as revision 12262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 09:30:56 +00:00
Baptiste Coudurier
dbb7cbf26e fix possible overflow with memmove 
Originally committed as revision 12261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 09:30:05 +00:00
Baptiste Coudurier
26846ba515 support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking 
Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 18:27:21 +00:00
Baptiste Coudurier
221e21b70d support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov 
Originally committed as revision 12241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 18:21:58 +00:00
Baptiste Coudurier
60f5c96ee6 remove useless braces 
Originally committed as revision 12232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:42:07 +00:00
Baptiste Coudurier
18978a4918 indentation 
Originally committed as revision 12231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:41:40 +00:00
Baptiste Coudurier
6d680e1b50 rescale frame size, fix i.3g2 
Originally committed as revision 12230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:36:49 +00:00
Baptiste Coudurier
f296563e5f move parameters reset after setting stream parameters, will need those infos 
Originally committed as revision 12229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:31:36 +00:00
Baptiste Coudurier
852859ff7c protect malloc overflow 
Originally committed as revision 12208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 12:45:59 +00:00
Baptiste Coudurier
17871a02ad indentation 
Originally committed as revision 12207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 12:44:15 +00:00
Baptiste Coudurier
b014dd7695 fail if extradata cannot be allocated 
Originally committed as revision 12206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 12:42:32 +00:00
Baptiste Coudurier
501f162fde honor stsd v1 first, fix mace surge-2-8-MAC3.mov, beware of mulaw,alaw 
Originally committed as revision 11928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 19:26:45 +00:00
Baptiste Coudurier
6a1f4535f8 10l, forgot alaw/mulaw mono, use bits_per_sample in fact, 
it should correctly set by av_get_bits_per_sample if recognized

Originally committed as revision 11925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 13:11:10 +00:00
Baptiste Coudurier
d435e520d8 warn use if edit list is not starting at 0, a/v desync might occur 
Originally committed as revision 11923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 10:58:16 +00:00
Baptiste Coudurier
fffa99ddd0 remove now useless code 
Originally committed as revision 11922 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 10:53:48 +00:00
Baptiste Coudurier
531527652f remove messy and not always correct chunk size workaround, use correct values instead 
Originally committed as revision 11921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 10:52:23 +00:00
Baptiste Coudurier
300aa2b039 return error when dv audio extraction fails 
Originally committed as revision 11913 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 22:37:44 +00:00
Baptiste Coudurier
e6920f2445 remove obsolete comments 
Originally committed as revision 11912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 22:34:43 +00:00
Baptiste Coudurier
3a3aa49ab7 remove useless braces 
Originally committed as revision 11911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 22:34:03 +00:00
Baptiste Coudurier
311490cccd cosmetics, indentation, braces 
Originally committed as revision 11910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 22:33:35 +00:00
Baptiste Coudurier
8cb66fd8f2 split chunks in the case of big compressed audio frames, 
might be tweaked, fix qt_dv_pal_test.mov.

Originally committed as revision 11909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 22:32:35 +00:00
Baptiste Coudurier
77c7543702 use correct demux mechanism when audio compression id is -2, dv audio does not matter, demux partially qt_dv_pal_test.mov which does NOT use cid -2 
Originally committed as revision 11908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 22:23:05 +00:00
Baptiste Coudurier
56ea717b46 indentation 
Originally committed as revision 11905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 14:10:52 +00:00
Baptiste Coudurier
4f0e712ecb more correct and simpler 
Originally committed as revision 11904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 14:10:29 +00:00
Michael Niedermayer
744a9c75cf Allow the user to select which codec out of several in stsd he wants. 
Originally committed as revision 11873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-06 01:51:32 +00:00
Reimar Döffinger
cc8c2c6ab3 Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer. 
Originally committed as revision 11638 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-27 19:57:04 +00:00
Michael Niedermayer
cc8d87b793 Set subtitle codec id correctly, i hope this does not break anything. 
Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 22:57:53 +00:00
Reimar Döffinger
7dfc1fdea2 Extract the pure plaintext from mov text subtitles. 
Formatting information etc. is discarded.

Originally committed as revision 11625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 21:21:55 +00:00
Michael Niedermayer
1e3c9307e6 Set correct codec type and id for text subtitles. 
fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov
closes issue341

Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 20:30:03 +00:00
Michael Niedermayer
41e19673ef indent 
Originally committed as revision 11623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 20:07:57 +00:00
Michael Niedermayer
ee6e2dbebf Only export packets which belong to the existing AVStream. 
To export the others separate AVStreams must be created!

Originally committed as revision 11622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 20:07:30 +00:00
Michael Niedermayer
0bc4728e3b Select non jpeg if there are multiple substreams. 
Originally committed as revision 11621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 19:50:04 +00:00
Baptiste Coudurier
29c90869e6 cosmetics, split overly long lines 
Originally committed as revision 11434 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-06 14:18:13 +00:00
Baptiste Coudurier
bde246014f supports glbl atom containing generic extradata for all codecs 
Originally committed as revision 11271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 15:39:10 +00:00
Baptiste Coudurier
bcfe2ba02c useless 0L here 
Originally committed as revision 11243 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:51:00 +00:00
Baptiste Coudurier
282b65ccff remove now useless fields 
Originally committed as revision 11242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:46:57 +00:00
Baptiste Coudurier
7c622eede5 do not retain useless pointers to avstream priv_data, use it directly 
Originally committed as revision 11241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:45:48 +00:00
Baptiste Coudurier
11f16b661a remove duplicate field 
Originally committed as revision 11240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:30:45 +00:00
Baptiste Coudurier
03dc32f689 cosmetics: func -> parse, remove useless parenthesis 
Originally committed as revision 11239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:26:34 +00:00
Baptiste Coudurier
a4813b671a remove useless declaration 
Originally committed as revision 11238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:24:32 +00:00
Baptiste Coudurier
73d07c275a save pointer to parse table, it is unlikely to change 
Originally committed as revision 11237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:20:27 +00:00
Baptiste Coudurier
23d2cfe9a5 remove useless seek 
Originally committed as revision 11236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:10:52 +00:00
Baptiste Coudurier
01eeb422fd cosmetics 
Originally committed as revision 11235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:10:18 +00:00
Baptiste Coudurier
687f35f384 support streamed mov/mp4 
Originally committed as revision 11234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 18:08:06 +00:00
Baptiste Coudurier
2aaf95a210 choose next sample by sample position 
when streams' next dts difference is below AV_TIME_BASE,
to reduce seeking, needed for slow underlying protocols (http),
a slightly modified patch from elupus, elupus at ecce dot se

Originally committed as revision 11226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-15 19:08:42 +00:00
Mike Melanson
9de2919ce5 adjust indentation on latest patch 
Originally committed as revision 11167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-05 04:32:45 +00:00
Mike Melanson
8b35bd806d Check sanity in the palette loading operation. The addresses a potential security risk in 
the MOV/MP4 demuxer.

Originally committed as revision 11166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-05 04:30:33 +00:00
Baptiste Coudurier
c1da59fa2d return error if malloc failed, found by takis, fix issue 286 
Originally committed as revision 11162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-03 22:26:07 +00:00
Panagiotis Issaris
9cf0419bb1 check mov_read_default return value where appropriate, patch by takis, fix issue 285 
Originally committed as revision 11161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-03 22:22:50 +00:00
Reimar Döffinger
1fe47470d1 Make ff_qt_default_palette_* arrays "static const" 
Originally committed as revision 11139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-02 23:27:01 +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
Diego Biurrun
94472c1d49 comment typo 
Originally committed as revision 10992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-10 12:05:30 +00:00
Baptiste Coudurier
3d2308b0af use FFMIN 
Originally committed as revision 10848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-23 22:28:57 +00:00
Baptiste Coudurier
8622613d9f fix issue 225, instead of stoping when wrong atom size is found, 
limit atom size to what is left, assuming container atom has correct size..
cricket4.3g2 has incorrect moov atom size which indicates that file size should be
2 bytes bigger than it is and quicktime reads it correctly though.

Originally committed as revision 10836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-22 14:36:14 +00:00
Baptiste Coudurier
68bc33fa9f append extradata atoms when parsing, fix OLOCOONS_O3.mov 
Originally committed as revision 10688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-08 13:06:48 +00:00
Baptiste Coudurier
aaac6c29d2 stop parsing udta if size is wrong/garbage, fix issue 154, fix RQ004F14.MOV 
Originally committed as revision 10481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-12 10:18:01 +00:00
Baptiste Coudurier
74e9b9ae70 set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov 
Originally committed as revision 9895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-04 12:33:34 +00:00
Michael Niedermayer
bca7db3530 detect MS wav codecs 
fixes detection of audio codec though not playback of surge-2-16-L-ms11.mov

Originally committed as revision 9885 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-04 00:22:28 +00:00
Benoit Fouet
d2ace376b0 fill title, author, copyright and comment fields by parsing udta atom 
Originally committed as revision 9840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-31 15:20:36 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Baptiste Coudurier
4440b1188e simplify, no need for a function 
Originally committed as revision 9008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-12 22:17:40 +00:00
Baptiste Coudurier
54a5c7193b fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti 
Originally committed as revision 9007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-12 22:02:27 +00:00
Baptiste Coudurier
b236a735e5 remove no more true comment 
Originally committed as revision 8829 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-26 11:46:04 +00:00
Baptiste Coudurier
e23848a49c cosmectics, use consistant and homogeneous type names for atoms 
Originally committed as revision 8828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-26 11:36:05 +00:00
Baptiste Coudurier
f8c18cd711 use dprintf with AVFormatContext and simplify 
Originally committed as revision 8827 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-26 11:24:10 +00:00
Baptiste Coudurier
1c086afc21 remove now obsolete and no more true comments 
Originally committed as revision 8824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-26 08:42:21 +00:00
Baptiste Coudurier
263a93ecff add 'wide' reversed tag in probe, detect broken xdcam files xdcam_hd_1080i60.mov 
Originally committed as revision 8811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-25 15:57:15 +00:00
Baptiste Coudurier
1c02d96f6d long -> int 
Originally committed as revision 8774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-21 18:37:10 +00:00
Baptiste Coudurier
9e40addd21 cosmetics: mov_mp4 -> mp4 
Originally committed as revision 8773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-21 18:12:51 +00:00
Baptiste Coudurier
0b07ac425a clean and simplify esds reading function 
Originally committed as revision 8772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-21 18:09:14 +00:00
Baptiste Coudurier
d614f57978 remove broken ctab code 
Originally committed as revision 8771 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-21 18:03:53 +00:00
Baptiste Coudurier
fa22ca2214 use INT64_MAX 
Originally committed as revision 8770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-21 18:01:47 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing 
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 13:51:57 +00:00
Nicholas Tung
e4141433ea Get rid of unnecessary pointer casts. 
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 20:24:16 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks 
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:34:15 +00:00
Baptiste Coudurier
11979c460c move atom size check before parsing function search 
Originally committed as revision 8546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-29 10:45:34 +00:00
Baptiste Coudurier
a097e559b2 unset sample count to disable track when is broken 
Originally committed as revision 8545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-29 10:42:22 +00:00
Baptiste Coudurier
62b6498df2 break if atom size is more than size left in container atom, fix shooter.mov 
Originally committed as revision 8544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-29 10:37:07 +00:00
Baptiste Coudurier
c59f24e657 activate parser on MP3 id, fix [A-Destiny]_Konjiki_no_Gash_Bell_-_65_[71EE362C].mp4 
Originally committed as revision 8516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 15:15:35 +00:00
Baptiste Coudurier
b0c17f7776 dont fail immediately when a somehow broken track is detected, some tracks might be good, fix mi2_vorbis51.mp4 
Originally committed as revision 8512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 15:06:50 +00:00
Baptiste Coudurier
ccba88d764 cosmectics, mov -> mp4 
Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-24 15:24:36 +00:00
Baptiste Coudurier
e14f79ed37 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame 
Originally committed as revision 8464 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-21 10:28:03 +00:00
Baptiste Coudurier
638fd2fce7 cosmetics 
Originally committed as revision 8463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-21 10:19:37 +00:00
Baptiste Coudurier
2d2432b738 set audio frame size based on stts 
Originally committed as revision 8462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-21 10:17:52 +00:00
Michel Bardiaux
318c5e0524 Give context to dprintf 
Originally committed as revision 8338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 12:36:41 +00:00
Baptiste Coudurier
1e5f5e3b7a use common tables for mov muxer and demuxer 
Originally committed as revision 8205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-03 14:55:11 +00:00
Baptiste Coudurier
25f5f17fbd cosmetics, cleanup tables, add pcm 24/32 le tags 
Originally committed as revision 8204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-03 14:33:55 +00:00
Baptiste Coudurier
b0c59da234 partial avid meridien uncompressed support 
Originally committed as revision 8203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-03 14:11:45 +00:00
Baptiste Coudurier
57d4d6e733 avid imx support 
Originally committed as revision 8193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 12:33:59 +00:00
Baptiste Coudurier
9a63497b0f support for mjpeg bottom field first in mov 
Originally committed as revision 8192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 12:26:07 +00:00
Baptiste Coudurier
014a510282 use generic atom to extradata reading function 
Originally committed as revision 8191 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 12:12:29 +00:00
Baptiste Coudurier
c828c70916 quicktime 'raw ' support 
Originally committed as revision 8168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-01 13:03:33 +00:00
Baptiste Coudurier
e809d7e50a remove some printf warnings 
Originally committed as revision 7691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 15:59:58 +00:00
Baptiste Coudurier
01aa1937cf make vars unsigned 
Originally committed as revision 7690 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 15:57:41 +00:00
Baptiste Coudurier
649348777e stop if current sample is higher than sample count 
Originally committed as revision 7689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 15:46:59 +00:00
Baptiste Coudurier
560588b717 replace strcpy by memcpy 
Originally committed as revision 7685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 12:49:24 +00:00
Baptiste Coudurier
a20a37e69a remove useless field 
Originally committed as revision 7682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 10:57:38 +00:00
Baptiste Coudurier
69e7070da6 remove obsolete comment 
Originally committed as revision 7681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 10:56:45 +00:00
Baptiste Coudurier
44d3fea53b make some fields unsigned 
Originally committed as revision 7680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 10:55:07 +00:00
Baptiste Coudurier
dfcf8d57c5 add sanity checks 
Originally committed as revision 7679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 10:44:24 +00:00
Michael Niedermayer
7caf0cc62c add codec_id <-> codec_tag tables to AVIn/OutputFormat 
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 01:39:17 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +00:00
Baptiste Coudurier
429088dc52 add msrle fourcc, quicktime_bmp.mov 
Originally committed as revision 7541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 00:40:06 +00:00
Baptiste Coudurier
69d987a6e6 add png fourcc 
Originally committed as revision 7540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 00:26:39 +00:00
Baptiste Coudurier
c3135e11f4 add official VC1 fourcc 
Originally committed as revision 7434 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-10 10:30:03 +00:00
Diego Biurrun
2eed5a461f Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin 
Originally committed as revision 7416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-06 23:54:01 +00:00
Baptiste Coudurier
8cb976931a partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4 
Originally committed as revision 7032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 01:05:31 +00:00
Baptiste Coudurier
95a07973cb support m1a hdlr mpeg elementary audio handler, fix Po-Slow_Death_64K.mov 
Originally committed as revision 6951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-09 00:09:27 +00:00
Baptiste Coudurier
48855b26d4 do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov 
Originally committed as revision 6890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-03 16:19:14 +00:00
Baptiste Coudurier
80c5b9a161 indention 
Originally committed as revision 6886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-03 15:04:47 +00:00
Baptiste Coudurier
152e9a43f2 reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4 
Originally committed as revision 6885 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-03 15:02:51 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts. 
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 22:39:58 +00:00
Baptiste Coudurier
a512446ed3 clean, always write major brand for debug 
Originally committed as revision 6862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 19:16:18 +00:00
Baptiste Coudurier
02799762c6 remove useless mp4 field 
Originally committed as revision 6861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 19:12:07 +00:00
Baptiste Coudurier
b59cb45632 remove mov_read_leaf and remove useless reading function table, mov_read_default will skip atom with no parsing function anyway 
Originally committed as revision 6793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-25 22:50:49 +00:00
Aurelien Jacobs
7fbde3431a replace coder/decoder file description in libavformat by muxer/demuxer 
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-23 08:57:54 +00:00
Baptiste Coudurier
20da94e8c5 activate gif decoder, seems to work fine on showdown2.mov 
Originally committed as revision 6767 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-22 16:17:02 +00:00
Baptiste Coudurier
d966b2f0db warn about zlib support needed if file has compressed moov atom 
Originally committed as revision 6747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-20 13:06:50 +00:00
Michael Niedermayer
942f3bb528 move memory reading ByteIOContext init from mov.c to avobuf.c 
Originally committed as revision 6744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-20 09:32:48 +00:00
Michael Niedermayer
143bf7d7c3 dont mess with ByteIOContext internal variables (fixes showdown2.mov) 
Originally committed as revision 6733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-19 10:05:36 +00:00
Dominik Mierzejewski
ccd3228e54 Use proper PRI?64 macros for %ll? format to fix printf format warnings: 
utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
asf.c:872: warning: format ‘%Lx’ expects type ‘long long unsigned int’, but argument 4 has type ‘int64_t’
mov.c:1754: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 5 has type ‘int64_t’

Approved by Michael.

Originally committed as revision 6692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-14 20:43:39 +00:00
Kostya Shishkov
a991b1fecb TIFF decoder 
Originally committed as revision 6682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-13 10:48:29 +00:00
Kostya Shishkov
3689cf1649 Targa image decoder 
Originally committed as revision 6640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 04:15:04 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Baptiste Coudurier
b95d44b6f4 remove useless casts 
Originally committed as revision 6552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-04 13:18:51 +00:00
Baptiste Coudurier
9a630c2532 remove useless casts 
Originally committed as revision 6377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-29 10:30:52 +00:00
Baptiste Coudurier
626a8fe724 remove gcc warnings about void * used in arithmetic 
Originally committed as revision 6376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-29 10:28:11 +00:00
Baptiste Coudurier
9770089d34 move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov 
Originally committed as revision 6373 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-28 17:59:26 +00:00
Baptiste Coudurier
e6f4c806e3 add lpcm fourcc 
Originally committed as revision 6372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-28 17:54:59 +00:00
Baptiste Coudurier
0299a87c41 change codec id if sample size field is set to 24 in stsd, fix Sony-mx5p.mov 
Originally committed as revision 6371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-28 17:52:48 +00:00
Michael Niedermayer
a41104f86a fix sound of SampleVideo.mov (mp2 in mov) 
Originally committed as revision 6191 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-07 20:19:37 +00:00
Baptiste Coudurier
c61900c6e9 fix mac3audio.mov, pcm_s8 and pcm_u8 can only have sample size of 1 and only if mono, dont rely on bits per sample which can be wrong 
Originally committed as revision 6079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 18:39:57 +00:00
Baptiste Coudurier
b95319a2f2 move amr parameters adjusting like other codecs 
Originally committed as revision 6071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 09:53:53 +00:00
Baptiste Coudurier
d00f8e1771 dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them 
Originally committed as revision 6069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 09:09:20 +00:00
Baptiste Coudurier
312954f056 put dv demuxing code around ifdef 
Originally committed as revision 6066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 08:37:51 +00:00
Baptiste Coudurier
989ac5a685 put dv demuxing code around ifdef 
Originally committed as revision 6065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 08:32:52 +00:00
Baptiste Coudurier
b60c04547c support vdva fourcc (dv + dv audio in mov) 
Originally committed as revision 6064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 08:28:11 +00:00
Baptiste Coudurier
b361ba2a45 fourcc cleanup 
Originally committed as revision 5969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-09 12:11:32 +00:00
Baptiste Coudurier
61e3dd7865 enable 'NONE' audio fourcc 
Originally committed as revision 5968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-09 12:10:25 +00:00
Baptiste Coudurier
2965f17b4f sample size is 1 if bits per sample is 8 and mono channel 
Originally committed as revision 5920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-03 16:22:01 +00:00
Baptiste Coudurier
e40ee6a268 move common code from mov.c and movenc.c to isom.c 
Originally committed as revision 5882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-01 14:58:15 +00:00
Baptiste Coudurier
986c2ccb19 add some useful debug info 
Originally committed as revision 5881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-01 13:43:24 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c 
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-12 00:09:34 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers 
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-10 21:14:37 +00:00
Baptiste Coudurier
2ec7b29b98 assign exact codec id, needed when stream copy 
Originally committed as revision 5705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-10 12:10:10 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names 
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 23:40:53 +00:00
Baptiste Coudurier
4990951be8 simplify, use LE_32, BE_32 macros 
Originally committed as revision 5682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-08 23:23:47 +00:00
Baptiste Coudurier
cfca95f14d clean up useless code 
Originally committed as revision 5669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-08 13:36:31 +00:00
Baptiste Coudurier
1f1890c754 better handling of partial files 
Originally committed as revision 5668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-08 12:58:50 +00:00
Baptiste Coudurier
b72708f8f3 new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm 
Originally committed as revision 5667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-08 12:14:41 +00:00
Baptiste Coudurier
e8d2507c1a add MS ADPCM fourcc 
Originally committed as revision 5655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-07 09:43:46 +00:00
Baptiste Coudurier
e7cc4b52f9 skip others fourcc, if present 
Originally committed as revision 5654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-07 08:56:05 +00:00
Baptiste Coudurier
421de2575b clean 
Originally committed as revision 5653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-07 08:45:50 +00:00