ffmpeg.git
8 years agomatroskaenc: write colourspace element for rawvideo tracks
Aurelien Jacobs [Mon, 13 Jun 2011 16:37:32 +0000 (18:37 +0200)]
matroskaenc: write colourspace element for rawvideo tracks

8 years agonsv: simplify probe function
Aurelien Jacobs [Mon, 13 Jun 2011 16:30:55 +0000 (18:30 +0200)]
nsv: simplify probe function

8 years agonsv: return error code instead of discarding it in read_header()
Aurelien Jacobs [Mon, 13 Jun 2011 16:28:54 +0000 (18:28 +0200)]
nsv: return error code instead of discarding it in read_header()

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 13 Jun 2011 02:25:36 +0000 (04:25 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: add missing NULL check in parse_options()
  x11grab: remove a memory allocation and the associated memcpy.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoH264: Reduce pointless diffs to qatar
Michael Niedermayer [Mon, 13 Jun 2011 01:30:56 +0000 (03:30 +0200)]
H264: Reduce pointless diffs to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "H264: Split out hl_motion and template it, this seems a bit faster"
Michael Niedermayer [Mon, 13 Jun 2011 01:00:53 +0000 (03:00 +0200)]
Revert "H264: Split out hl_motion and template it, this seems a bit faster"

This reverts commit a50f0bea25a3da605cd547fe3bdfd36c8764b847.

This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge

Conflicts:

libavcodec/h264.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavfilter: implement avfilter_fill_frame_from_video_buffer_ref()
Stefano Sabatini [Sat, 11 Jun 2011 16:21:53 +0000 (18:21 +0200)]
libavfilter: implement avfilter_fill_frame_from_video_buffer_ref()

8 years agoavfiltergraph: make the AVFilterInOut alloc/free API public
Stefano Sabatini [Sat, 11 Jun 2011 13:30:46 +0000 (15:30 +0200)]
avfiltergraph: make the AVFilterInOut alloc/free API public

This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.

8 years agoavfiltergraph: change the syntax of avfilter_graph_parse()
Stefano Sabatini [Sat, 11 Jun 2011 13:16:02 +0000 (15:16 +0200)]
avfiltergraph: change the syntax of avfilter_graph_parse()

Make it returns the list of open inputs and outputs, so it can be
reused by applications.

Breaks API/ABI.

8 years agographparser: prefer void * over AVClass * for log contexts
Stefano Sabatini [Sat, 11 Jun 2011 12:33:09 +0000 (14:33 +0200)]
graphparser: prefer void * over AVClass * for log contexts

8 years agoh264: Complexify frame num gap shortening code
Alexander Strange [Thu, 2 Jun 2011 08:39:56 +0000 (01:39 -0700)]
h264: Complexify frame num gap shortening code

By observation it did not seem to handle prev_frame_num > frame_num.
This does not affect any files I have.
(cherry picked from commit 43c0092a80f8212cbb783260bafa157f7b85126e)

8 years agoUpdate todo
Alexander Strange [Thu, 2 Jun 2011 08:41:38 +0000 (01:41 -0700)]
Update todo

All the known bugs in h264 are fixed so I'm calling it done.
(cherry picked from commit 9cec36a6845c17e90a8d0c2cf9b03a00987c31f0)

8 years agompeg12: replace 2 asserts by av_assert0
Michael Niedermayer [Sun, 12 Jun 2011 15:59:23 +0000 (17:59 +0200)]
mpeg12: replace 2 asserts by av_assert0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocmdutils: add missing NULL check in parse_options()
Stefano Sabatini [Sun, 12 Jun 2011 11:54:22 +0000 (13:54 +0200)]
cmdutils: add missing NULL check in parse_options()

Fix ffplay -i FILE, which was recently broken.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agox11grab: remove a memory allocation and the associated memcpy.
Sven C. Dack [Wed, 30 Mar 2011 15:02:29 +0000 (17:02 +0200)]
x11grab: remove a memory allocation and the associated memcpy.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 12 Jun 2011 01:26:38 +0000 (03:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix "make install" with documentation disabled
  build: simplify some conditional targets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix --disable-everything
Michael Niedermayer [Sat, 11 Jun 2011 11:40:46 +0000 (13:40 +0200)]
Fix --disable-everything

Breakage was due to ff_find_pix_fmt() usage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: fix "make install" with documentation disabled
Mans Rullgard [Sat, 11 Jun 2011 18:54:23 +0000 (19:54 +0100)]
build: fix "make install" with documentation disabled

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agobuild: simplify some conditional targets
Mans Rullgard [Tue, 7 Jun 2011 09:11:21 +0000 (10:11 +0100)]
build: simplify some conditional targets

Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoresample: clarify supported resampling.
Clément Bœsch [Wed, 8 Jun 2011 09:26:43 +0000 (11:26 +0200)]
resample: clarify supported resampling.

This also fix a crash on 8ch → 2ch requested resampling.

8 years agolavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
Stefano Sabatini [Sat, 11 Jun 2011 09:41:49 +0000 (11:41 +0200)]
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

Require "void *" rather than "AVClass *" for the log context type.

8 years agoavfiltergraph: use meaningful error codes
Stefano Sabatini [Sat, 11 Jun 2011 09:15:40 +0000 (11:15 +0200)]
avfiltergraph: use meaningful error codes

8 years agoRevert "ac3: there was no libav in 2010 thus this code cannot be from libav."
Michael Niedermayer [Sat, 11 Jun 2011 02:18:00 +0000 (04:18 +0200)]
Revert "ac3: there was no libav in 2010 thus this code cannot be from  libav."

This reverts commit 7b8ec38d28cc99c4017471c6981fc1206732b468.

The copyright date was wrong.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 11 Jun 2011 01:51:36 +0000 (03:51 +0200)]
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>
8 years agoFix -t option for formats which holds dts and no pts
Etienne Buira [Fri, 10 Jun 2011 22:04:40 +0000 (00:04 +0200)]
Fix -t option for formats which holds dts and no pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodnxhd: Renama tables
Joseph Artsimovich [Fri, 10 Jun 2011 19:38:14 +0000 (21:38 +0200)]
dnxhd: Renama tables

8 years agoExtract rotation in MOV metadata
Dave Badia [Fri, 10 Jun 2011 19:18:26 +0000 (21:18 +0200)]
Extract rotation in MOV metadata

8 years agobitstream: Properly promote av_reverse values before shifting.
Alex Converse [Tue, 26 Apr 2011 16:08:26 +0000 (09:08 -0700)]
bitstream: Properly promote av_reverse values before shifting.

8 years agopixfmt: Replace 9/10bit deprecation by a technical explanation.
Michael Niedermayer [Fri, 10 Jun 2011 18:25:49 +0000 (20:25 +0200)]
pixfmt: Replace 9/10bit deprecation by a technical explanation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavutil/swscale: YUV444P10/YUV444P9 support.
Ronald S. Bultje [Thu, 9 Jun 2011 02:16:39 +0000 (19:16 -0700)]
libavutil/swscale: YUV444P10/YUV444P9 support.

Also add missing glue code for recently added YUV422P10 formats
to swscale.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoH.264: Fix high bit depth explicit biweight
Jason Garrett-Glaser [Fri, 10 Jun 2011 01:20:19 +0000 (18:20 -0700)]
H.264: Fix high bit depth explicit biweight

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoh264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
Oskar Arvidsson [Fri, 10 Jun 2011 00:40:10 +0000 (02:40 +0200)]
h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.

The tc variable was not splatted correctly.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoReplace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
Diego Biurrun [Tue, 7 Jun 2011 11:18:12 +0000 (13:18 +0200)]
Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.

8 years agoUpdate copyright year for ac3enc_opts_template.c.
Justin Ruggles [Fri, 10 Jun 2011 16:58:08 +0000 (12:58 -0400)]
Update copyright year for ac3enc_opts_template.c.

The code was originally committed to Libav on March 25, 2011.

8 years agoadts: Adjust frame size mask to follow the specification.
Kieran Kunhya [Wed, 8 Jun 2011 06:26:20 +0000 (01:26 -0500)]
adts: Adjust frame size mask to follow the specification.

This fixes ADTS detection for at least one sample.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoAPIchanges: fill hash for the avfilter_get_audio_buffer_ref_from_arrays addition
Stefano Sabatini [Fri, 10 Jun 2011 11:03:22 +0000 (13:03 +0200)]
APIchanges: fill hash for the avfilter_get_audio_buffer_ref_from_arrays addition

8 years agolavfi: avfilter_merge_formats: handle case where inputs are same
Mina Nagy Zaki [Wed, 8 Jun 2011 16:24:25 +0000 (19:24 +0300)]
lavfi: avfilter_merge_formats: handle case where inputs are same

This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.

8 years agolavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c
Stefano Sabatini [Sat, 12 Feb 2011 16:56:50 +0000 (17:56 +0100)]
lavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c

Use avfilter_get_audio_buffer_ref_from_arrays() in
avfilter_default_get_audio_buffer(), simplify.

8 years agolavfi: implement avfilter_get_audio_buffer_ref_from_arrays()
Stefano Sabatini [Sun, 30 Jan 2011 23:07:41 +0000 (00:07 +0100)]
lavfi: implement avfilter_get_audio_buffer_ref_from_arrays()

8 years agoAPIchanges: remove duplicated entry
Stefano Sabatini [Fri, 10 Jun 2011 10:32:25 +0000 (12:32 +0200)]
APIchanges: remove duplicated entry

8 years agoAPIchanges: fill in dates and numbers
Stefano Sabatini [Fri, 10 Jun 2011 09:15:42 +0000 (11:15 +0200)]
APIchanges: fill in dates and numbers

Since some minor bump were not done, some entries present the same
libavutil minor (which represent the next bump after the corresponding
change).

8 years agoAPIchanges: remove duplicated entry
Stefano Sabatini [Fri, 10 Jun 2011 09:50:55 +0000 (11:50 +0200)]
APIchanges: remove duplicated entry

Remove duplicated entry regarding PIX_FMT_BGR48LE/BE formats.

8 years agoAPIchanges: correctly interleave entries
Stefano Sabatini [Fri, 10 Jun 2011 09:08:55 +0000 (11:08 +0200)]
APIchanges: correctly interleave entries

8 years agoAPIchanges: add entry for av_force_cpu_flags() addition
Stefano Sabatini [Fri, 10 Jun 2011 09:06:55 +0000 (11:06 +0200)]
APIchanges: add entry for av_force_cpu_flags() addition

8 years agolavf: bump minor after the addition of fps_probe_size to AVFormatContext
Stefano Sabatini [Fri, 10 Jun 2011 09:54:54 +0000 (11:54 +0200)]
lavf: bump minor after the addition of fps_probe_size to AVFormatContext

8 years agolavc: bump minor after the addition of AVCodecContext.request_sample_fmt
Stefano Sabatini [Fri, 10 Jun 2011 09:24:04 +0000 (11:24 +0200)]
lavc: bump minor after the addition of AVCodecContext.request_sample_fmt

8 years agomovenc: Add RTP muxer/hinter options
Martin Storsjö [Sat, 21 May 2011 11:58:43 +0000 (14:58 +0300)]
movenc: Add RTP muxer/hinter options

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomovenc: Pass the RTP AVFormatContext to the SDP generation
Martin Storsjö [Wed, 18 May 2011 12:41:38 +0000 (15:41 +0300)]
movenc: Pass the RTP AVFormatContext to the SDP generation

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortspenc: Add RTP muxer options
Martin Storsjö [Sat, 21 May 2011 12:03:48 +0000 (15:03 +0300)]
rtspenc: Add RTP muxer options

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortspenc: Add an AVClass for setting muxer specific options
Martin Storsjö [Sat, 21 May 2011 12:03:35 +0000 (15:03 +0300)]
rtspenc: Add an AVClass for setting muxer specific options

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpenc_chain: Pass the rtpflags options through to the chained muxer
Martin Storsjö [Wed, 18 May 2011 12:42:53 +0000 (15:42 +0300)]
rtpenc_chain: Pass the rtpflags options through to the chained muxer

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpenc: Declare the rtp flags private AVOptions in rtpenc.h
Martin Storsjö [Fri, 27 May 2011 19:38:36 +0000 (22:38 +0300)]
rtpenc: Declare the rtp flags private AVOptions in rtpenc.h

This allows other muxers that chain a RTP muxer to declare
the same options easily.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agosdp: Reindent after the previous commit
Martin Storsjö [Wed, 18 May 2011 12:48:20 +0000 (15:48 +0300)]
sdp: Reindent after the previous commit

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpenc: MP4A-LATM payload support
Juan Carlos Rodriguez [Wed, 18 May 2011 12:00:03 +0000 (15:00 +0300)]
rtpenc: MP4A-LATM payload support

This is enabled with an AVOption on the RTP muxer. The SDP
generator looks for a latm flag in the rtpflags field.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoavoptions: Add an av_opt_flag_is_set function for inspecting flag fields
Martin Storsjö [Fri, 27 May 2011 19:21:40 +0000 (22:21 +0300)]
avoptions: Add an av_opt_flag_is_set function for inspecting flag fields

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agosdp: Allow passing an AVFormatContext to the SDP generation
Martin Storsjö [Wed, 18 May 2011 12:41:06 +0000 (15:41 +0300)]
sdp: Allow passing an AVFormatContext to the SDP generation

Options from the AVFormatContext can be read for modifying
the generated SDP.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomov: Fix wrong timestamp generation for fragmented movies that have time offset cause...
Yusuke Nakamura [Fri, 13 May 2011 14:46:48 +0000 (23:46 +0900)]
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>
8 years agompeg12: more advanced ffmpeg mpeg2 aspect guessing code.
Michael Niedermayer [Fri, 25 Mar 2011 00:13:08 +0000 (01:13 +0100)]
mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.

Fixes issue1613, 621, 562 simultaneously

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoac3: there was no libav in 2010 thus this code cannot be from libav.
Michael Niedermayer [Fri, 10 Jun 2011 02:54:30 +0000 (04:54 +0200)]
ac3: there was no libav in 2010 thus this code cannot be from  libav.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 Jun 2011 01:54:27 +0000 (03:54 +0200)]
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>
8 years agoswscale: split YUYV output out of yuv2packed[12X]_c().
Ronald S. Bultje [Thu, 9 Jun 2011 22:13:53 +0000 (18:13 -0400)]
swscale: split YUYV output out of yuv2packed[12X]_c().

This is part of the Great Evil Plan to simplify swscale.

8 years agodict: This code was developed in ffmpeg and not libav, nor by libav developers.
Michael Niedermayer [Thu, 9 Jun 2011 22:19:25 +0000 (00:19 +0200)]
dict: This code was developed in ffmpeg and not libav, nor by libav developers.
Correct copyright notices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: make compute_pkt_fields2() return meaningful error values
Stefano Sabatini [Tue, 15 Mar 2011 11:34:55 +0000 (12:34 +0100)]
lavf: make compute_pkt_fields2() return meaningful error values

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomatroskadec: set timestamps for RealAudio packets.
Reimar Döffinger [Sat, 26 Feb 2011 11:52:01 +0000 (12:52 +0100)]
matroskadec: set timestamps for RealAudio packets.

Improves seeking in ffplay with
http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agointelh263dec: aspect ratio processing fix.
Anton Khirnov [Thu, 9 Jun 2011 20:36:31 +0000 (22:36 +0200)]
intelh263dec: aspect ratio processing fix.

patch submitted by xvid_fan freenet de

8 years agointelh263dec: fix "Strict H.263 compliance" file playback
Anton Khirnov [Thu, 9 Jun 2011 20:29:40 +0000 (22:29 +0200)]
intelh263dec: fix "Strict H.263 compliance"  file playback

fixes issue2449

patch submitted by xvid_fan freenet de

8 years agooss,sndio: simplify by using FFMIN.
Reimar Döffinger [Tue, 29 Mar 2011 18:18:45 +0000 (20:18 +0200)]
oss,sndio: simplify by using FFMIN.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoswscale: extract monowhite/black output from yuv2packed[12X]_c().
Ronald S. Bultje [Thu, 9 Jun 2011 20:25:21 +0000 (16:25 -0400)]
swscale: extract monowhite/black output from yuv2packed[12X]_c().

This is part of the Great Evil Plan to simplify swscale.

8 years agoswscale: de-macro'ify RGB15/16/32 input functions.
Ronald S. Bultje [Thu, 9 Jun 2011 17:59:21 +0000 (13:59 -0400)]
swscale: de-macro'ify RGB15/16/32 input functions.

Inline functions are easier to read, maintain, modify and test,
which justifies the slightly increased source size. This patch
also adds support for non-native endianness RGB15/16 and fixes
isSupportedOutput() to no longer claim that we support writing
non-native RGB565/555/444.

8 years agoswscale: rearrange code.
Ronald S. Bultje [Thu, 9 Jun 2011 14:00:09 +0000 (10:00 -0400)]
swscale: rearrange code.

This way the code in the file is less cluttered all-over-the-
place.

8 years agomovdec: Add support for the 'wfex' atom.
Alex Converse [Mon, 6 Jun 2011 17:59:46 +0000 (10:59 -0700)]
movdec: Add support for the 'wfex' atom.

The 'wfex' is just a Microsoft WaveFormatEx struct.

8 years agoffmpeg.c: Add a necessary const qualifier
Alex Converse [Thu, 9 Jun 2011 16:52:47 +0000 (09:52 -0700)]
ffmpeg.c: Add a necessary const qualifier

8 years agoriff: Fix potential memleak.
Alex Converse [Thu, 9 Jun 2011 16:50:38 +0000 (09:50 -0700)]
riff: Fix potential memleak.

Make ff_get_wav_header() free existing extradata before allocing a new
buffer.

8 years agoswscale: change 48bit RGB input macros to inline functions.
Ronald S. Bultje [Wed, 8 Jun 2011 19:12:32 +0000 (15:12 -0400)]
swscale: change 48bit RGB input macros to inline functions.

Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.

8 years agoswscale: change 9/10bit YUV input macros to inline functions.
Ronald S. Bultje [Wed, 8 Jun 2011 18:50:49 +0000 (14:50 -0400)]
swscale: change 9/10bit YUV input macros to inline functions.

Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.

8 years agoswscale: extract gray16 output functions from yuv2packed[12X]().
Ronald S. Bultje [Wed, 8 Jun 2011 17:29:09 +0000 (13:29 -0400)]
swscale: extract gray16 output functions from yuv2packed[12X]().

This is part of the Great Evil Plan to simplify swscale.

8 years agoswscale: use standard clipping functions.
Ronald S. Bultje [Tue, 7 Jun 2011 15:22:54 +0000 (11:22 -0400)]
swscale: use standard clipping functions.

This generates better code on some non-x86 architectures.

8 years agoswscale: merge macros that are used only once.
Ronald S. Bultje [Tue, 7 Jun 2011 15:06:44 +0000 (11:06 -0400)]
swscale: merge macros that are used only once.

This reduces source code size without affecting the binary.

8 years agoswscale: fix function declarations in swscale.c.
Ronald S. Bultje [Wed, 8 Jun 2011 16:31:11 +0000 (12:31 -0400)]
swscale: fix function declarations in swscale.c.

Remove inline keyword from functions that are never inlined.
Use av_always_inline for functions that should be force-inlined
for performance reasons. Use av_cold for init functions.

8 years agoswscale: fix function declaration keywords in x86/swscale_template.c.
Ronald S. Bultje [Wed, 8 Jun 2011 16:12:50 +0000 (12:12 -0400)]
swscale: fix function declaration keywords in x86/swscale_template.c.

Remove inline keyword for functions that are only called through
their function pointers (and thus cannot be inlined); add av_cold
keyword to init function, and use av_always_inline instead of
inline for functions that must be inlined for performance reasons.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 9 Jun 2011 02:47:19 +0000 (04:47 +0200)]
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>
8 years agojpegdec: actually search for and parse RSTn
Michael Niedermayer [Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)]
jpegdec: actually search for and parse RSTn

Fixes Ticket267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocrypto: Use av_freep instead of av_free
Etienne Buira [Wed, 8 Jun 2011 00:20:53 +0000 (02:20 +0200)]
crypto: Use av_freep instead of av_free

This fixes a potential double free.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoRevert "crypto: fix potential double free"
Michael Niedermayer [Wed, 8 Jun 2011 23:39:49 +0000 (01:39 +0200)]
Revert "crypto: fix potential double free"

This reverts commit 7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a.

Revert at authors request, and its buggy missing &

8 years agoRevert "build: remove empty $(OBJS) target"
Michael Niedermayer [Wed, 8 Jun 2011 14:14:40 +0000 (16:14 +0200)]
Revert "build: remove empty $(OBJS) target"

This reverts commit b9c6c7cb25932b594fd684a0cb553e439d49fe12.
It appears this caused the .o files to be deletec under some circumstances.

8 years agocrypto: Use av_freep instead of av_free
Etienne Buira [Wed, 8 Jun 2011 00:20:53 +0000 (02:20 +0200)]
crypto: Use av_freep instead of av_free

This fixes a potential double free.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoaac: fix adts frame size mask, fix demuxer probing for some files.
Baptiste Coudurier [Tue, 7 Jun 2011 18:09:58 +0000 (11:09 -0700)]
aac: fix adts frame size mask, fix demuxer probing for some files.

8 years agolavf: don't try to free private options if priv_data is NULL.
Anton Khirnov [Mon, 6 Jun 2011 11:14:05 +0000 (13:14 +0200)]
lavf: don't try to free private options if priv_data is NULL.

This might happen if there was an error before priv_data was allocated
and result in segfault.

8 years agolavfi: handle NULL lists in avfilter_make_format_list
Mina Nagy Zaki [Tue, 7 Jun 2011 14:42:32 +0000 (17:42 +0300)]
lavfi: handle NULL lists in avfilter_make_format_list

8 years agoswscale: fix types of assembly arguments.
Ronald S. Bultje [Wed, 8 Jun 2011 15:39:26 +0000 (11:39 -0400)]
swscale: fix types of assembly arguments.

This prevents the following compiler warnings: "warning:
initialization from incompatible pointer type". Since the
variables are only ever used in inline assembly, their type
is actually irrelevant (so the part where it was wrong did
not invoke any buggy behaviour).

8 years agoswscale: move two macros that are only used once into caller.
Ronald S. Bultje [Wed, 8 Jun 2011 15:33:46 +0000 (11:33 -0400)]
swscale: move two macros that are only used once into caller.

This way, they look like regular code, which is easier to
understand.

8 years agoswscale: remove unused function.
Ronald S. Bultje [Wed, 8 Jun 2011 15:03:11 +0000 (11:03 -0400)]
swscale: remove unused function.

Use of this wrapper was removed in a previous patch, but I
forgot to actually remove the function itself.

8 years agoFix "mixed declarations and code" warnings.
Carl Eugen Hoyos [Wed, 8 Jun 2011 14:38:37 +0000 (16:38 +0200)]
Fix "mixed declarations and code" warnings.

8 years agooptions: Add missing braces around struct initializer.
Diego Biurrun [Wed, 8 Jun 2011 12:59:47 +0000 (14:59 +0200)]
options: Add missing braces around struct initializer.

This fixes the warning:
libavformat/options.c:62:1: warning: missing braces around initializer [-Wmissing-braces]

8 years agomov: Remove leftover crufty debug statement with references to a local file.
Diego Biurrun [Sun, 5 Jun 2011 14:10:17 +0000 (16:10 +0200)]
mov: Remove leftover crufty debug statement with references to a local file.

8 years agodvbsubdec: Fix compilation of debug code.
Diego Biurrun [Mon, 6 Jun 2011 12:10:22 +0000 (14:10 +0200)]
dvbsubdec: Fix compilation of debug code.

8 years agoRemove all uses of now deprecated metadata functions.
Anton Khirnov [Sun, 22 May 2011 10:46:29 +0000 (12:46 +0200)]
Remove all uses of now deprecated metadata functions.

8 years agoMove metadata API from lavf to lavu.
Anton Khirnov [Sun, 22 May 2011 10:45:00 +0000 (12:45 +0200)]
Move metadata API from lavf to lavu.

Rename it to AVDictionary, since it will be used as such.  Tags
documentation and metadata conversion API is lavf-specific, so remains
there.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 8 Jun 2011 01:56:36 +0000 (03:56 +0200)]
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>
8 years agocrypto: fix potential double free
Etienne Buira [Wed, 8 Jun 2011 00:20:53 +0000 (02:20 +0200)]
crypto: fix potential double free