]> git.sesse.net Git - ffmpeg/log
ffmpeg
10 years agoavcodec/cavsdec: print warning if no frame has been decoded
Michael Niedermayer [Thu, 5 Dec 2013 01:17:15 +0000 (02:17 +0100)]
avcodec/cavsdec: print warning if no frame has been decoded

Fixes ticket3128

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/cavsdec: reset stc
Michael Niedermayer [Thu, 5 Dec 2013 01:16:59 +0000 (02:16 +0100)]
avcodec/cavsdec: reset stc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/cabac: force get_cabac to be not inlined
Michael Niedermayer [Thu, 5 Dec 2013 00:41:10 +0000 (01:41 +0100)]
avcodec/cabac: force get_cabac to be not inlined

works around bug in gccs inline asm register assignment
Fixes Ticket3177

gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 4 Dec 2013 21:05:11 +0000 (22:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Detect msvcrt libc with a CPP check instead of a link check

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '5ec467328122b80fac94c2d5e3e7540d50381868'
Michael Niedermayer [Wed, 4 Dec 2013 19:50:11 +0000 (20:50 +0100)]
Merge commit '5ec467328122b80fac94c2d5e3e7540d50381868'

* commit '5ec467328122b80fac94c2d5e3e7540d50381868':
  configure: Add detected C library and host compiler to informative output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoswresample: use the internal buffer for resampling the last few samples
Michael Niedermayer [Wed, 4 Dec 2013 19:25:43 +0000 (20:25 +0100)]
swresample: use the internal buffer for resampling the last few samples

Fixes out of array read
Fixes Ticket3193

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoconfigure: Detect msvcrt libc with a CPP check instead of a link check
Diego Biurrun [Wed, 4 Dec 2013 15:25:04 +0000 (10:25 -0500)]
configure: Detect msvcrt libc with a CPP check instead of a link check

Simplifies host/target libc detection splitting.

10 years agoconfigure: Add detected C library and host compiler to informative output
Diego Biurrun [Thu, 28 Feb 2013 15:06:39 +0000 (16:06 +0100)]
configure: Add detected C library and host compiler to informative output

10 years agoavformat/utils: move update_wrap_reference() up
Michael Niedermayer [Wed, 4 Dec 2013 13:34:05 +0000 (14:34 +0100)]
avformat/utils: move update_wrap_reference() up

simplifies code
also remove extra {}

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/utils: reorder operations in update_wrap_reference()
Michael Niedermayer [Wed, 4 Dec 2013 13:29:35 +0000 (14:29 +0100)]
avformat/utils: reorder operations in update_wrap_reference()

prevents a integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoRevert "avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set"
Michael Niedermayer [Wed, 4 Dec 2013 10:35:21 +0000 (11:35 +0100)]
Revert "avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set"

This reverts commit 758b6d39f685a510f48ff9e4c05fffa859d23c42.

Requested-by: smarter
"now that http://git.videolan.org/?p=ffmpeg.git;a=commit;h=97de206b44a48da726807cc3e7b9448a8112760b
 has been merged, http://git.videolan.org/?p=ffmpeg.git;a=commit;h=758b6d39f685a510f48ff9e4c05fffa859d23c42
 could be reverted, this would reduce the delta with libav
 (and it makes sense)"

10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 4 Dec 2013 03:30:42 +0000 (04:30 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: initialize hwaccel_pix_fmt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agompegts: do not set pts for missing dts in video streams
Rainer Hochecker [Tue, 3 Dec 2013 09:03:04 +0000 (10:03 +0100)]
mpegts: do not set pts for missing dts in video streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/utils: correct for timestamp wrap earlier
Michael Niedermayer [Wed, 4 Dec 2013 01:00:23 +0000 (02:00 +0100)]
avformat/utils: correct for timestamp wrap earlier

This uses dts & pts as reference instead of first_dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/utils: also fix wrapping of start_time in update_initial_timestamps()
Michael Niedermayer [Wed, 4 Dec 2013 01:15:41 +0000 (02:15 +0100)]
avformat/utils: also fix wrapping of start_time in update_initial_timestamps()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/utils: Fix pts_wrap_behavior calculation with negative first_dts
Michael Niedermayer [Wed, 4 Dec 2013 00:49:14 +0000 (01:49 +0100)]
avformat/utils: Fix pts_wrap_behavior calculation with negative first_dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffprobe: free shared writer context on exit
Stefano Sabatini [Tue, 3 Dec 2013 20:25:36 +0000 (21:25 +0100)]
ffprobe: free shared writer context on exit

Fix leak.

Spotted-by: Michael Niedermayer
10 years agolibavcodec/mpegaudio: change CONFIG_FLOAT to USE_FLOAT
Michael Niedermayer [Tue, 3 Dec 2013 18:55:12 +0000 (19:55 +0100)]
libavcodec/mpegaudio: change CONFIG_FLOAT to USE_FLOAT

The CONFIG_ name-space is set by configure, so its better to use a
different prefix here.
This also unifies the encoder & decoder define that is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec: split mp2 encoder into float and fixed
Michael Niedermayer [Sat, 16 Nov 2013 12:15:35 +0000 (13:15 +0100)]
avcodec: split mp2 encoder into float and fixed

This makes the USE_FLOATS == 0 available to the end user
More float optimizations can easily be added as well now
common code should be factored out into a common file once all
fixed point & floating point optimizations are done, this is to
avoid having to move code back and forth between files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavconv: initialize hwaccel_pix_fmt
Anton Khirnov [Sat, 23 Nov 2013 13:07:48 +0000 (14:07 +0100)]
avconv: initialize hwaccel_pix_fmt

Fixes an assertion failure in vdpau_get_buffer() when -hwaccel auto is
used, but hwaccel init fails.

10 years agovp9_parser: handle zero-sized packets.
Ronald S. Bultje [Tue, 3 Dec 2013 12:29:35 +0000 (07:29 -0500)]
vp9_parser: handle zero-sized packets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 3 Dec 2013 11:20:44 +0000 (12:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  alsa-audio-dec: explicitly cast the delay to a signed int64

Conflicts:
libavdevice/alsa-audio-dec.c

no change as the buggy code has been replaced in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoalsa-audio-dec: explicitly cast the delay to a signed int64
Anton Khirnov [Sun, 1 Dec 2013 08:27:01 +0000 (09:27 +0100)]
alsa-audio-dec: explicitly cast the delay to a signed int64

Otherwise the expression will be evaluated as unsigned, which will break
when the result should be negative.
CC:libav-stable@libav.org

10 years agoavfilter/vf_pad: fix req_end
Michael Niedermayer [Tue, 3 Dec 2013 03:08:37 +0000 (04:08 +0100)]
avfilter/vf_pad: fix req_end

Fixes out of array accesses
Fixes Ticket3190

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMakefile: add dependancies for ffversion.h
Michael Niedermayer [Tue, 3 Dec 2013 00:23:58 +0000 (01:23 +0100)]
Makefile: add dependancies for ffversion.h

It has to be build before the objects that use it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodoc/examples/filtering_audio: init packet0.data
Michael Niedermayer [Mon, 2 Dec 2013 23:00:04 +0000 (00:00 +0100)]
doc/examples/filtering_audio: init packet0.data

Fixes use of uinitialized data and crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodoc/ffserver: remove spurious NoAudio option from stream example
Stefano Sabatini [Mon, 2 Dec 2013 22:47:30 +0000 (23:47 +0100)]
doc/ffserver: remove spurious NoAudio option from stream example

10 years agolavfi/volume: support all channel counts
Stefano Sabatini [Mon, 2 Dec 2013 18:44:09 +0000 (19:44 +0100)]
lavfi/volume: support all channel counts

10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 2 Dec 2013 22:04:05 +0000 (23:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dv: Split off DV video encoder into its own file

Conflicts:
libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'
Michael Niedermayer [Mon, 2 Dec 2013 19:24:02 +0000 (20:24 +0100)]
Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'

* commit '21710ea82118c9d19bea9277b2a85a33096fdd95':
  dv: Move DV VLC data tables out of header file

Conflicts:
libavcodec/dv_vlc_data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'
Michael Niedermayer [Mon, 2 Dec 2013 19:17:36 +0000 (20:17 +0100)]
Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'

* commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276':
  build: Add rule for building host-specific object files

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'ad477710244c761ad1c21246c34e0075fee12d11'
Michael Niedermayer [Mon, 2 Dec 2013 19:03:24 +0000 (20:03 +0100)]
Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11'

* commit 'ad477710244c761ad1c21246c34e0075fee12d11':
  build: Add shorthand for HOSTCC compile macro

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodoc/examples/filtering_audio: fix chunked audio decoding
Stefano Sabatini [Mon, 2 Dec 2013 14:21:52 +0000 (15:21 +0100)]
doc/examples/filtering_audio: fix chunked audio decoding

Support the case when multiple frames are contained in a single packet.
In particular, fix fate-samples/lossless-audio/luckynight-partial.shn
sample decoding.

10 years agodoc/examples/filtering_audio: fix style
Stefano Sabatini [Mon, 2 Dec 2013 13:43:40 +0000 (14:43 +0100)]
doc/examples/filtering_audio: fix style

10 years agodoc/examples/filtering_video: do not make use of AVBufferSinkParams
Stefano Sabatini [Mon, 2 Dec 2013 13:31:44 +0000 (14:31 +0100)]
doc/examples/filtering_video: do not make use of AVBufferSinkParams

Set the value on the filter context instead. Simplify.

10 years agodoc/examples/filtering_video: add some error handling in init_filters()
Stefano Sabatini [Mon, 2 Dec 2013 13:25:45 +0000 (14:25 +0100)]
doc/examples/filtering_video: add some error handling in init_filters()

10 years agodoc/examples/README: fix typo
Stefano Sabatini [Mon, 2 Dec 2013 13:22:11 +0000 (14:22 +0100)]
doc/examples/README: fix typo

10 years agodoc/examples/filtering_audio: add more error checks
Stefano Sabatini [Mon, 2 Dec 2013 12:18:11 +0000 (13:18 +0100)]
doc/examples/filtering_audio: add more error checks

10 years agodoc/examples/filtering: make use of av_err2str()
Stefano Sabatini [Mon, 2 Dec 2013 12:08:00 +0000 (13:08 +0100)]
doc/examples/filtering: make use of av_err2str()

Simplify.

10 years agodv: Split off DV video encoder into its own file
Diego Biurrun [Thu, 5 Apr 2012 14:58:43 +0000 (16:58 +0200)]
dv: Split off DV video encoder into its own file

10 years agodv: Move DV VLC data tables out of header file
Diego Biurrun [Sun, 10 Nov 2013 16:23:31 +0000 (17:23 +0100)]
dv: Move DV VLC data tables out of header file

10 years agobuild: Add rule for building host-specific object files
Diego Biurrun [Sun, 1 Dec 2013 05:01:51 +0000 (06:01 +0100)]
build: Add rule for building host-specific object files

10 years agobuild: Add shorthand for HOSTCC compile macro
Diego Biurrun [Mon, 2 Dec 2013 02:51:48 +0000 (03:51 +0100)]
build: Add shorthand for HOSTCC compile macro

10 years agolibavutil & opencl: remove opencl default device type
Lenny Wang [Sat, 30 Nov 2013 07:27:57 +0000 (01:27 -0600)]
libavutil & opencl: remove opencl default device type

CL_DEVICE_TYPE_DEFAULT makes duplicated device entries for each
platform using av_opencl_get_device_list()

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Reviewed-by: highgod0401 <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoconfigure: put pthread_create() check back
Michael Niedermayer [Mon, 2 Dec 2013 10:11:08 +0000 (11:11 +0100)]
configure: put pthread_create() check back

Unbreaks freebsd, broken since f058f384a0d76bfd125f4738dceab7c890186432

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 2 Dec 2013 09:59:41 +0000 (10:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo

If someone optimizes dct_quantize for non x86 SIMD, then this
probably needs to be reverted.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo
Diego Biurrun [Sun, 1 Dec 2013 04:05:23 +0000 (05:05 +0100)]
dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo

The table is MMX-specific and used nowhere else.

10 years agoavcodec/h264_refs: improve key frame detection heuristic
Michael Niedermayer [Mon, 2 Dec 2013 01:36:58 +0000 (02:36 +0100)]
avcodec/h264_refs: improve key frame detection heuristic

Fixes Ticket3186

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/h264_refs: split conditions of if() up for better readability
Michael Niedermayer [Mon, 2 Dec 2013 01:12:39 +0000 (02:12 +0100)]
avcodec/h264_refs: split conditions of if() up for better readability

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/avisynth: remove duplicate av_new_packet() call
Michael Niedermayer [Sun, 1 Dec 2013 21:12:57 +0000 (22:12 +0100)]
avformat/avisynth: remove duplicate av_new_packet() call

Found-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 1 Dec 2013 20:50:13 +0000 (21:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Try to find nonstandard Perl path from the environment

Conflicts:
doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '3cd612d44789948f72b52944474e0870c5c60964'
Michael Niedermayer [Sun, 1 Dec 2013 20:17:55 +0000 (21:17 +0100)]
Merge commit '3cd612d44789948f72b52944474e0870c5c60964'

* commit '3cd612d44789948f72b52944474e0870c5c60964':
  gitignore: Ignore multilibrary example programs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoRevert "vf_yadif: move x86 init code to x86/yadif.c"
Michael Niedermayer [Sun, 1 Dec 2013 16:42:07 +0000 (17:42 +0100)]
Revert "vf_yadif: move x86 init code to x86/yadif.c"

This reverts commit a87b17f3283aada762820f1b797eeb7a2dff6c61.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

libavfilter/vf_yadif.c
libavfilter/x86/yadif.c
libavfilter/x86/yadif_template.c
libavfilter/yadif.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoRevert "yadif: add parens around macro parameters"
Michael Niedermayer [Sun, 1 Dec 2013 15:37:18 +0000 (16:37 +0100)]
Revert "yadif: add parens around macro parameters"

This reverts commit 49e617f9565b6528fe707bae7ea4b62b10c771a5.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

libavfilter/vf_yadif.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named...
Michael Niedermayer [Sun, 1 Dec 2013 15:26:17 +0000 (16:26 +0100)]
avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects"

This reverts commit 568c70e79ee267426c15ef4603c69703f6a5884a.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodoc/ffserver: fix misc minor typos
Stefano Sabatini [Sun, 1 Dec 2013 00:19:26 +0000 (01:19 +0100)]
doc/ffserver: fix misc minor typos

10 years agodoc: Try to find nonstandard Perl path from the environment
Diego Biurrun [Fri, 29 Nov 2013 18:24:56 +0000 (13:24 -0500)]
doc: Try to find nonstandard Perl path from the environment

10 years agoavisynth: make avs_library statically allocated.
Anton Khirnov [Sun, 1 Dec 2013 11:03:35 +0000 (06:03 -0500)]
avisynth: make avs_library statically allocated.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavisynth: Move to av_new_packet/av_free_packet.
Stephen Hutchinson [Sun, 1 Dec 2013 11:03:34 +0000 (06:03 -0500)]
avisynth: Move to av_new_packet/av_free_packet.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agogitignore: Ignore multilibrary example programs
Diego Biurrun [Sun, 1 Dec 2013 03:05:11 +0000 (04:05 +0100)]
gitignore: Ignore multilibrary example programs

10 years agoAdd an Opus and a Speex muxer.
Carl Eugen Hoyos [Sun, 1 Dec 2013 11:03:34 +0000 (12:03 +0100)]
Add an Opus and a Speex muxer.

Fixes ticket #3181.

10 years agoSupport AC-3 in Sega Dreamcast Sofdec files.
Carl Eugen Hoyos [Sun, 1 Dec 2013 11:02:21 +0000 (12:02 +0100)]
Support AC-3 in Sega Dreamcast Sofdec files.

Fixes ticket #3184

10 years agovp9: make decode_coeffs() return value void.
Ronald S. Bultje [Sat, 30 Nov 2013 14:37:14 +0000 (09:37 -0500)]
vp9: make decode_coeffs() return value void.

It was previously int and would return error if decode_coeffs_b()
returns an error; however, that can never happen, so refactor all
that code to make all dependent functions return void also (all the
way up to decode_coeffs_sb()).

10 years agovp9: add a new segmentation sample.
Ronald S. Bultje [Fri, 29 Nov 2013 23:51:27 +0000 (18:51 -0500)]
vp9: add a new segmentation sample.

The old one didn't use segmentation. One uses segmentation in all frame
types (--aq-mode=1), and the other uses all segmentation features, but
only in inter frames (mbgraph).

10 years agovp9: add fate sample for parallelmode.
Ronald S. Bultje [Thu, 28 Nov 2013 21:26:14 +0000 (16:26 -0500)]
vp9: add fate sample for parallelmode.

This disables backward probability updates, which makes the codec more
friendly for frame-level multi-threading.

10 years agovp9: cosmetics.
Ronald S. Bultje [Mon, 25 Nov 2013 12:31:57 +0000 (07:31 -0500)]
vp9: cosmetics.

10 years agovp9: add a 2-pass decoding mode, and add frame-mt support.
Ronald S. Bultje [Sat, 30 Nov 2013 14:08:54 +0000 (09:08 -0500)]
vp9: add a 2-pass decoding mode, and add frame-mt support.

For a random 1080p sample, decoding time went from 9.7sec (1 threads)
to 6.0sec (2 threads) and 5.2sec (4 threads) in 2-pass decoding mode.
I don't have any samples that use the parallelmode feature, but the
gains should be higher.

10 years agovp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically.
Ronald S. Bultje [Sat, 23 Nov 2013 17:10:12 +0000 (12:10 -0500)]
vp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically.

10 years agovp9: split last/cur_frame from the reference buffers.
Ronald S. Bultje [Sat, 23 Nov 2013 15:27:18 +0000 (10:27 -0500)]
vp9: split last/cur_frame from the reference buffers.

We need more information from last/cur_frame than from reference
buffers, so we can use a simplified structure for reference buffers,
and then store mvs and segmentation map information in last/cur.

10 years agovp9: move some entries out of VP9Block into VP9Context.
Ronald S. Bultje [Tue, 26 Nov 2013 02:42:13 +0000 (21:42 -0500)]
vp9: move some entries out of VP9Block into VP9Context.

They aren't really block-related variables in the sense that they are
not block-coded, rather they are state trackers.

10 years agovp9: split packet parsing into an AVParser.
Ronald S. Bultje [Sat, 23 Nov 2013 14:04:39 +0000 (09:04 -0500)]
vp9: split packet parsing into an AVParser.

10 years agovp9: use proper refcounting.
Ronald S. Bultje [Mon, 18 Nov 2013 01:54:47 +0000 (20:54 -0500)]
vp9: use proper refcounting.

Based on something similar in libav. Author is likely Anton Khirnov
<anton@khirnov.net> but I'm not sure.

10 years agoMakefile: remove version.h on distclean
Michael Niedermayer [Sat, 30 Nov 2013 20:52:39 +0000 (21:52 +0100)]
Makefile: remove version.h on distclean

Without this nothing will remove it even if it isnt generated in newer
versions anymore.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agobuild: rename version.h to libavutil/ffversion.h
Timothy Gu [Fri, 29 Nov 2013 00:29:41 +0000 (16:29 -0800)]
build: rename version.h to libavutil/ffversion.h

Also the libavutil/ffversion.h will be installed.

Rationale:
* Applications might want to know FFmpeg's version besides the individual
  libraries'.
* Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
  a library source file includes both and is compiled on an out-of-tree build.

Fixes #1769.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoversion.sh: add preprocessing guards
Timothy Gu [Fri, 29 Nov 2013 17:57:30 +0000 (09:57 -0800)]
version.sh: add preprocessing guards

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoversion.sh: add a little usage comment
Timothy Gu [Fri, 29 Nov 2013 00:57:49 +0000 (16:57 -0800)]
version.sh: add a little usage comment

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Nov 2013 20:08:47 +0000 (21:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: Add some logging before returning on error

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'f058f384a0d76bfd125f4738dceab7c890186432'
Michael Niedermayer [Sat, 30 Nov 2013 19:37:34 +0000 (20:37 +0100)]
Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'

* commit 'f058f384a0d76bfd125f4738dceab7c890186432':
  configure: Do not use pthread_create to check for pthread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/mpeg4video: fix doxycomments so they are not associated with random unrelated...
Michael Niedermayer [Sat, 30 Nov 2013 19:30:11 +0000 (20:30 +0100)]
avcodec/mpeg4video: fix doxycomments so they are not associated with random unrelated fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sat, 30 Nov 2013 16:48:15 +0000 (17:48 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc/srtenc: use bprint for text buffers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoversion.sh: make it independant of version.h file name
Timothy Gu [Fri, 29 Nov 2013 01:00:28 +0000 (17:00 -0800)]
version.sh: make it independant of version.h file name

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodoc/ffserver: clarify documentation for Feed MaxFileSize option
Stefano Sabatini [Sat, 30 Nov 2013 13:47:26 +0000 (14:47 +0100)]
doc/ffserver: clarify documentation for Feed MaxFileSize option

10 years agodoc/ffserver: clarify that note in NoDaemon option documentation
Stefano Sabatini [Sat, 30 Nov 2013 13:46:53 +0000 (14:46 +0100)]
doc/ffserver: clarify that note in NoDaemon option documentation

10 years agoffserver: print error code description in case of write_header() failure
Stefano Sabatini [Fri, 29 Nov 2013 16:24:09 +0000 (17:24 +0100)]
ffserver: print error code description in case of write_header() failure

Improve feedback.

10 years agodoc/ffserver: add "Detailed description" chapter
Stefano Sabatini [Fri, 29 Nov 2013 15:36:15 +0000 (16:36 +0100)]
doc/ffserver: add "Detailed description" chapter

Also move FFM section up in the file, and rename it.

10 years agodoc/ffserver: remove more mentions to LAME and build
Stefano Sabatini [Fri, 29 Nov 2013 14:43:19 +0000 (15:43 +0100)]
doc/ffserver: remove more mentions to LAME and build

10 years agolavc/srtenc: use bprint for text buffers.
Nicolas George [Mon, 25 Nov 2013 15:27:41 +0000 (16:27 +0100)]
lavc/srtenc: use bprint for text buffers.

Fix trac ticket #3120.

10 years agolavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed
James Almer [Fri, 29 Nov 2013 04:45:05 +0000 (01:45 -0300)]
lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed

They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodcadec: Add some logging before returning on error
Tim Walker [Fri, 29 Nov 2013 17:12:26 +0000 (18:12 +0100)]
dcadec: Add some logging before returning on error

Based on a patch by Michael Niedermayer.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
10 years agoconfigure: Do not use pthread_create to check for pthread
Luca Barbato [Fri, 29 Nov 2013 17:29:12 +0000 (09:29 -0800)]
configure: Do not use pthread_create to check for pthread

Certain instrumentation addons leads to a false positive in configure
and link failures at the end of the build phase.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
10 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 30 Nov 2013 04:07:15 +0000 (05:07 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
  ffmpeg: free empty subtitles as well in transcode_subtitles
  ffmpeg: do not pass possibly undefined subtitles to sub2video_update

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Nov 2013 03:48:23 +0000 (04:48 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  go2meeting: disallow tile dimensions that are not multiple of 16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'e026ee0446de27fc38e33e98704fada012fdc763'
Michael Niedermayer [Sat, 30 Nov 2013 03:40:46 +0000 (04:40 +0100)]
Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'

* commit 'e026ee0446de27fc38e33e98704fada012fdc763':
  mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'
Michael Niedermayer [Sat, 30 Nov 2013 03:34:43 +0000 (04:34 +0100)]
Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'

* commit '513d849bb605d3d862da1ada709bd2ca1ac68f58':
  mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'
Michael Niedermayer [Sat, 30 Nov 2013 03:29:22 +0000 (04:29 +0100)]
Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'

* commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091':
  mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
Michael Niedermayer [Sat, 30 Nov 2013 03:21:45 +0000 (04:21 +0100)]
Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'

* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
  mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'
Michael Niedermayer [Sat, 30 Nov 2013 03:15:41 +0000 (04:15 +0100)]
Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'

* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324':
  mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'
Michael Niedermayer [Sat, 30 Nov 2013 03:02:11 +0000 (04:02 +0100)]
Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
  mpeg4videodec: remove a write-only variable from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'
Michael Niedermayer [Sat, 30 Nov 2013 02:54:35 +0000 (03:54 +0100)]
Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'

* commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab':
  mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'e89247debd5276d57ce4a26516224204f9541af0'
Michael Niedermayer [Sat, 30 Nov 2013 02:46:49 +0000 (03:46 +0100)]
Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'

* commit 'e89247debd5276d57ce4a26516224204f9541af0':
  mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>