ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 2 Sep 2012 19:00:15 +0000 (21:00 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  intrax8: move functions from dsputil to own context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add ansi256 test case
Peter Ross [Sun, 2 Sep 2012 02:27:19 +0000 (12:27 +1000)]
fate: add ansi256 test case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agointrax8: move functions from dsputil to own context
Mans Rullgard [Sat, 25 Aug 2012 13:35:52 +0000 (14:35 +0100)]
intrax8: move functions from dsputil to own context

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoexamples: add demuxing.c example
Stefano Sabatini [Wed, 29 Aug 2012 21:41:30 +0000 (23:41 +0200)]
examples: add demuxing.c example

7 years agolavf/segment: set EXT-X-VERSION to 3 rather than to 4
Stefano Sabatini [Sat, 1 Sep 2012 15:13:26 +0000 (17:13 +0200)]
lavf/segment: set EXT-X-VERSION to 3 rather than to 4

There is nothing we use of the latest version, downgrade version number
to increase decoding support.

Based on this comment by vel2000:
http://ffmpeg.org/trac/ffmpeg/ticket/1642#comment:17

7 years agolavfi: when configuring a link, set channel layout from previous link if unspecified
Stefano Sabatini [Fri, 31 Aug 2012 21:55:11 +0000 (23:55 +0200)]
lavfi: when configuring a link, set channel layout from previous link if unspecified

In avfilter_config_links(), if the current channel layout is not
specified, set the same value of the previous link in the filterchain.

Consistent with the logic used to set the other link parameters.

7 years agolavc/codec_desc: fix name of wavesynth codec
Stefano Sabatini [Sat, 1 Sep 2012 14:11:53 +0000 (16:11 +0200)]
lavc/codec_desc: fix name of wavesynth codec

7 years agoflvdec: fix creation of lots of phantom data streams
Michael Niedermayer [Sun, 2 Sep 2012 03:01:08 +0000 (05:01 +0200)]
flvdec: fix creation of lots of phantom data streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Treat warnings as errors in check_yasm()
jamal [Sat, 1 Sep 2012 16:36:10 +0000 (13:36 -0300)]
configure: Treat warnings as errors in check_yasm()

yasm generates a warning instead of an error when "CPU amdnop" is not supported, so the check always succeeds.

HAVE_CPUNOP as true when the available yasm version doesn't support amdnop doesn't make sense.
Check http://fate.ffmpeg.org/log.cgi?time=20120901143315&log=compile&slot=x86_64-archlinux-gcc-oldyasm to see the amount of warnings it generates.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopsxstr: more correct array type.
Michael Niedermayer [Sat, 1 Sep 2012 19:16:18 +0000 (21:16 +0200)]
psxstr: more correct array type.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofix flv new stream handling after head already parsed
Roman Arutyunyan [Sat, 1 Sep 2012 09:04:57 +0000 (13:04 +0400)]
fix flv new stream handling after head already parsed

This fixes stream lookup in flv demuxer. When used with librtmp
protocol streams are sometimes added after head arrived. If the
first stream added in flv header reader is Audio stream then it
is messed with Video stream added later in the code patched.
The result is I have 2 Audio streams (first of them is said to have
a video codec like h264) instead of Audio/Video pair.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: add missing new line to some error messages 2
Piotr Bandurski [Sat, 1 Sep 2012 14:56:11 +0000 (16:56 +0200)]
lavf: add missing new line to some error messages 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/vf_frei0: add missing new line to some error messages
Piotr Bandurski [Sat, 1 Sep 2012 14:52:34 +0000 (16:52 +0200)]
lavfi/vf_frei0: add missing new line to some error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: add missing new line to some messages
Piotr Bandurski [Sat, 1 Sep 2012 11:15:11 +0000 (13:15 +0200)]
lavc: add missing new line to some messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: add missing new line to some error messages
Piotr Bandurski [Sat, 1 Sep 2012 10:35:14 +0000 (12:35 +0200)]
lavf: add missing new line to some error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix libx264 profile listing
Mahendra M [Sat, 1 Sep 2012 13:35:44 +0000 (19:05 +0530)]
Fix libx264 profile listing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs: remove unused and half existing vo_fs variable
Michael Niedermayer [Sat, 1 Sep 2012 13:37:03 +0000 (15:37 +0200)]
libmpcodecs: remove unused and half existing vo_fs variable

It breaks linking with suncc sometimes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoansi: erase screen on first frame
Peter Ross [Sat, 1 Sep 2012 05:21:01 +0000 (15:21 +1000)]
ansi: erase screen on first frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoansi: support 256-colors
Peter Ross [Sat, 1 Sep 2012 05:18:19 +0000 (15:18 +1000)]
ansi: support 256-colors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoansi: support escaped codes where last argument is zero
Peter Ross [Sat, 1 Sep 2012 05:15:45 +0000 (15:15 +1000)]
ansi: support escaped codes where last argument is zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoansi: remove misplaced return
Peter Ross [Sat, 1 Sep 2012 05:15:13 +0000 (15:15 +1000)]
ansi: remove misplaced return

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 1 Sep 2012 12:59:03 +0000 (14:59 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only free vfilters on exit
  ffplay: replace SDL_delay in read thread with SDL_CondWait
  ffplay: requeue last picture on forced video refresh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'stev47/master'
Michael Niedermayer [Sat, 1 Sep 2012 12:22:58 +0000 (14:22 +0200)]
Merge remote-tracking branch 'stev47/master'

* stev47/master:
  cpia: move reget_buffer after header check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 1 Sep 2012 12:09:32 +0000 (14:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  crypto: Remove a stray double space
  Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*

Conflicts:
libavfilter/vf_delogo.c
libavfilter/vf_lut.c
libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix compilation with yasm-0.6.2.
Carl Eugen Hoyos [Sat, 1 Sep 2012 08:59:16 +0000 (10:59 +0200)]
Fix compilation with yasm-0.6.2.

7 years agoMerge branch 'master' of git://source.ffmpeg.org/ffmpeg
Stephan Hilb [Sat, 1 Sep 2012 08:16:56 +0000 (10:16 +0200)]
Merge branch 'master' of git://source.ffmpeg.org/ffmpeg

7 years agocpia: move reget_buffer after header check
Stephan Hilb [Sat, 1 Sep 2012 08:12:33 +0000 (10:12 +0200)]
cpia: move reget_buffer after header check

If the header is invalid, there is no need to get at buffer.
Do it after the header has been checked.
Suggested by Reimar Döffinger

7 years agolavfi/mp: remove decimate wrapper
Stefano Sabatini [Fri, 31 Aug 2012 14:12:38 +0000 (16:12 +0200)]
lavfi/mp: remove decimate wrapper

It was natively integrated into libavfilter.

7 years agoavoid ambigous buffersink names
Michael Niedermayer [Fri, 31 Aug 2012 20:13:16 +0000 (22:13 +0200)]
avoid ambigous buffersink names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavfilter: Support the forks ABI for buffer sinks
Michael Niedermayer [Fri, 31 Aug 2012 20:02:08 +0000 (22:02 +0200)]
libavfilter: Support the forks ABI for buffer sinks

With this change avconv compiled against libav and linked to ffmpegs libs
will run through the whole fate testsuite without any crashes.
857 tests pass, the remaining tests fail one way or another, which is
to be expected as avconv is not a drop in replacement for ffmpeg
The testsuite used was the ffmpeg fate testsuite, not libavs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec, matroskadec, srtenc: Read/Write duration for subtitles.
Philip Langdale [Wed, 23 May 2012 04:50:02 +0000 (21:50 -0700)]
matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.

After much discussion and back-and-forth, we reached the conclusion
that matroska uses convergence_duration for subtitle duration because
a 32bit value isn't large enough to store the duration if sub-micro-second
timebases are used. Matroska may not be the only one that supports these
timebases, but it's certainly the only one that ffmpeg attempts to support
in this way.

The long term solution that we seemed to reach was that if we encounter
a matroska file with a sub-micro-second timebase, we should internally
scale it up to at least micro-second, and then duration can be used
normally. This suggests that on the encode side, we should not allow
generation of files with sub-micro-second timebases, but that's a separate
issue.

That being a non-trivial change, and the subtitle interoperability breakage
being very real, I'm re-submitting this small change for consideration.

In this diff, we make sure that duration is populated by the matroska
demuxer, and that convergence_duration is respected in matroskaenc and
srtenc, but that duration is used otherwise. This ends up being a strict
improvement - pipelines that use convergence duration are unchanged, and
ones that are currently broken due to the duration mismatch will start
working - except for the ones with the extreme timebases, but those were
already broken.

Signed-off-by: Philip Langdale <philipl@overt.org>
7 years agofate-utvideoenc: remove unneeded -f avi
Michael Niedermayer [Fri, 31 Aug 2012 23:54:40 +0000 (01:54 +0200)]
fate-utvideoenc: remove unneeded -f avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr/resample: update SSSE3 flag to new name
Michael Niedermayer [Fri, 31 Aug 2012 23:20:54 +0000 (01:20 +0200)]
swr/resample: update SSSE3 flag to new name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocrypto: Remove a stray double space
Martin Storsjö [Thu, 30 Aug 2012 21:51:49 +0000 (00:51 +0300)]
crypto: Remove a stray double space

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoRename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*
Martin Storsjö [Fri, 31 Aug 2012 10:29:36 +0000 (13:29 +0300)]
Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoflic: use AV_LOG_ERROR for error message
Piotr Bandurski [Fri, 31 Aug 2012 18:57:42 +0000 (20:57 +0200)]
flic: use AV_LOG_ERROR for error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofilmstripdec: add new line to error message
Piotr Bandurski [Fri, 31 Aug 2012 18:50:20 +0000 (20:50 +0200)]
filmstripdec: add new line to error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: support building with the forks ABI for avcodec_find_best_pix_fmt2()
Michael Niedermayer [Fri, 31 Aug 2012 18:35:27 +0000 (20:35 +0200)]
lavc: support building with the forks ABI for avcodec_find_best_pix_fmt2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add switch to enable debian/libav compatible ABI
Michael Niedermayer [Fri, 31 Aug 2012 18:34:33 +0000 (20:34 +0200)]
configure: add switch to enable debian/libav compatible ABI

needed for avcodec_find_best_pix_fmt2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfiltergraph: use avcodec_find_best_pix_fmt_of_2()
Michael Niedermayer [Fri, 31 Aug 2012 18:18:43 +0000 (20:18 +0200)]
avfiltergraph: use avcodec_find_best_pix_fmt_of_2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg_filter: use avcodec_find_best_pix_fmt_of_2()
Michael Niedermayer [Fri, 31 Aug 2012 18:18:24 +0000 (20:18 +0200)]
ffmpeg_filter: use avcodec_find_best_pix_fmt_of_2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: add avcodec_find_best_pix_fmt_of_2()
Michael Niedermayer [Tue, 24 Jul 2012 23:37:38 +0000 (01:37 +0200)]
imgconvert: add avcodec_find_best_pix_fmt_of_2()

and deprecate avcodec_find_best_pix_fmt2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: only free vfilters on exit
Marton Balint [Wed, 29 Aug 2012 21:56:33 +0000 (23:56 +0200)]
ffplay: only free vfilters on exit

Freeing it in the end of the video thread is not a good idea, because we still
may need the filter names for the next video thread, in order to apply the
filters after chaning the video stream.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: replace SDL_delay in read thread with SDL_CondWait
Marton Balint [Mon, 27 Aug 2012 22:00:15 +0000 (00:00 +0200)]
ffplay: replace SDL_delay in read thread with SDL_CondWait

When the audio queue was empty, it was not filled until the 10ms delay expired
in the read thread. This patch changes the delay method with a condition wait,
which reacts to an empty queue a lot faster, therefore the audio buffer
underruns become less common especially after seeking.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: requeue last picture on forced video refresh
Marton Balint [Sun, 26 Aug 2012 13:18:00 +0000 (15:18 +0200)]
ffplay: requeue last picture on forced video refresh

Fixes ticket #1609.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agodvbsubdec: set width/height from display def if not set.
Reimar Döffinger [Mon, 27 Aug 2012 15:57:11 +0000 (17:57 +0200)]
dvbsubdec: set width/height from display def if not set.

This fixes playback of DVB subtitles in
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket1065/Test1.wtv
in MPlayer.
FFplay is not affected since it assumes that the subtitles
are scaled to match the video - but this usually isn't the
case after rescaling the video and stream-copying subtitles.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agowtvdec: set correct codec ID for CC streams.
Reimar Döffinger [Mon, 27 Aug 2012 20:08:56 +0000 (22:08 +0200)]
wtvdec: set correct codec ID for CC streams.

Closed caption data is definitely not teletext.
Since it contains a EIA-608 compatibility stream,
the EIA_608 codec ID is at least not completely wrong.
Fixes subtitle playback in MPlayer with the sample in
trac ticket #1482.
To fix the ticket itself I expect FFmpeg will need
a closed-caption to SRT decoder first.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agolavfi/hue: add process_command callback
Jérémy Tran [Thu, 30 Aug 2012 23:56:58 +0000 (01:56 +0200)]
lavfi/hue: add process_command callback

This allows dynamic reconfiguration of the filter.
The callback uses some code that was in the init function. Hence this code
has been moved in its own function.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoconfigure: add decimate filter dependency on avcodec
Stefano Sabatini [Fri, 31 Aug 2012 15:49:24 +0000 (17:49 +0200)]
configure: add decimate filter dependency on avcodec

7 years agolavfi: port decimate libmpcodecs filter
Stefano Sabatini [Sat, 17 Mar 2012 14:49:51 +0000 (15:49 +0100)]
lavfi: port decimate libmpcodecs filter

This filter is based on the MPlayer decimate filter by Rich Felker.

7 years agolavfi/mp=decimate: fix off-by-one logic in diff_C() x loop
Stefano Sabatini [Wed, 29 Aug 2012 11:08:49 +0000 (13:08 +0200)]
lavfi/mp=decimate: fix off-by-one logic in diff_C() x loop

Set x offset values in the range 0-7, rather than in the range 8-1.

The y loop is changed accordingly, to avoid confusion.

This also fixes output difference with the new pending native decimate
filter.

7 years agolavfi/mp: remove smartblur filter
Stefano Sabatini [Wed, 29 Aug 2012 08:36:08 +0000 (10:36 +0200)]
lavfi/mp: remove smartblur filter

It was natively integrated into libavfilter.

7 years agoflvdec: remove duplicate return
Michael Niedermayer [Fri, 31 Aug 2012 13:27:58 +0000 (15:27 +0200)]
flvdec: remove duplicate return

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_mp: fix duplicate return
Michael Niedermayer [Fri, 31 Aug 2012 13:26:33 +0000 (15:26 +0200)]
vf_mp: fix duplicate return

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd some missing _EXTERNAL suffixes to yasm source files.
Carl Eugen Hoyos [Fri, 31 Aug 2012 13:39:03 +0000 (15:39 +0200)]
Add some missing _EXTERNAL suffixes to yasm source files.

7 years agobuffersink: remove stray ;
Michael Niedermayer [Fri, 31 Aug 2012 13:22:01 +0000 (15:22 +0200)]
buffersink: remove stray ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobintext: remove stray ;
Michael Niedermayer [Fri, 31 Aug 2012 13:20:57 +0000 (15:20 +0200)]
bintext: remove stray ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsicinav: fix signed integer overflow
Michael Niedermayer [Fri, 31 Aug 2012 13:15:59 +0000 (15:15 +0200)]
dsicinav: fix signed integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: get rid of void casts in the option table
Michael Niedermayer [Fri, 31 Aug 2012 12:26:20 +0000 (14:26 +0200)]
ffplay: get rid of void casts in the option table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: fix function parameters
Michael Niedermayer [Fri, 31 Aug 2012 12:25:57 +0000 (14:25 +0200)]
ffplay: fix function parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 31 Aug 2012 11:18:48 +0000 (13:18 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  MSS1 and MSS2: set final pixel format after common stuff has been initialised
  MSS2 decoder
  configure: handle --disable-asm before check_deps
  x86: Split inline and external assembly #ifdefs
  configure: x86: Separate inline from standalone assembler capabilities
  pktdumper: Use a custom define instead of PATH_MAX for buffers
  pktdumper: Use av_strlcpy instead of strncpy
  pktdumper: Use sizeof(variable) instead of the direct buffer length

Conflicts:
Changelog
configure
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/dct-test.c
libavcodec/imgconvert.c
libavcodec/mss12.c
libavcodec/version.h
libavfilter/x86/gradfun.c
libswscale/x86/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
Michael Niedermayer [Fri, 31 Aug 2012 10:04:17 +0000 (12:04 +0200)]
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

* commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5':
  x86: Fix linking with some or all of yasm, mmx, optimizations disabled
  configure: Add more fine-grained SSE CPU capabilities flags
  avfilter: x86: Use more precise compile template names
  x86: cosmetics: Comment some #endifs for better readability
  g723_1: add comfort noise generation
  utvideoenc: Switch to dsputils' median prediction
  utvideoenc: Avoid writing into the input picture
  avtools: remove the distinction between func_arg and func2_arg.
  avconv: make the -passlogfile option per-stream.
  avconv: make the -pass option per-stream.
  cmdutils: make -codecs print lossy/lossless flags.
  lavc: add lossy/lossless codec properties.

Conflicts:
Changelog
cmdutils.c
configure
doc/APIchanges
ffmpeg.h
ffmpeg_opt.c
ffprobe.c
libavcodec/codec_desc.c
libavcodec/g723_1.c
libavcodec/utvideoenc.c
libavcodec/version.h
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/rv40dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoWrite TIFF Tag ExtraSamples when encoding pix_fmts that contain transparency information.
Carl Eugen Hoyos [Fri, 31 Aug 2012 09:15:07 +0000 (11:15 +0200)]
Write TIFF Tag ExtraSamples when encoding pix_fmts that contain transparency information.

7 years agoCosmetics: Reorder pix_fmts in tiffenc.c.
Carl Eugen Hoyos [Fri, 31 Aug 2012 09:01:02 +0000 (11:01 +0200)]
Cosmetics: Reorder pix_fmts in tiffenc.c.

7 years agoSimplify setting colour space for mono* when encoding tiff.
Carl Eugen Hoyos [Fri, 31 Aug 2012 08:57:36 +0000 (10:57 +0200)]
Simplify setting colour space for mono* when encoding tiff.

7 years agoMSS1 and MSS2: set final pixel format after common stuff has been initialised
Alberto Delmás [Fri, 31 Aug 2012 05:59:36 +0000 (07:59 +0200)]
MSS1 and MSS2: set final pixel format after common stuff has been initialised

This way it won't interfere with WMV9 initialisation inside MSS2 decoder and
avplay will play it fine.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agoMSS2 decoder
Alberto Delmás [Fri, 24 Aug 2012 15:45:57 +0000 (17:45 +0200)]
MSS2 decoder

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agov4l2: fix compile on systems that lack V4L2_PIX_FMT_CPIA1
Michael Niedermayer [Fri, 31 Aug 2012 02:35:06 +0000 (04:35 +0200)]
v4l2: fix compile on systems that lack V4L2_PIX_FMT_CPIA1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: handle --disable-asm before check_deps
Mans Rullgard [Fri, 31 Aug 2012 00:56:03 +0000 (01:56 +0100)]
configure: handle --disable-asm before check_deps

This is necessary to avoid spuriously enabling _external or _inline
variants of arch extensions when they should be disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agox86: Split inline and external assembly #ifdefs
Diego Biurrun [Tue, 28 Aug 2012 12:53:33 +0000 (14:53 +0200)]
x86: Split inline and external assembly #ifdefs

7 years agoconfigure: x86: Separate inline from standalone assembler capabilities
Diego Biurrun [Mon, 27 Aug 2012 01:07:11 +0000 (03:07 +0200)]
configure: x86: Separate inline from standalone assembler capabilities

7 years agoAdd CPiA video decoder
Stephan Hilb [Thu, 23 Aug 2012 16:40:22 +0000 (18:40 +0200)]
Add CPiA video decoder

The cpia video decoder is intended to be used with the v4l2 demuxer.
There are some small changes to the v4l2 demuxer to support the
variable frame length of the format.
Fixes ticket #1537

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Fix assert failure
Michael Niedermayer [Thu, 30 Aug 2012 22:00:28 +0000 (00:00 +0200)]
ffmpeg: Fix assert failure

Fixes Ticket1674

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofind_stream_info: update last_dts more often
Michael Niedermayer [Thu, 30 Aug 2012 21:41:16 +0000 (23:41 +0200)]
find_stream_info: update last_dts more often

This improves dts validity checks and consequently fps detection of files with invalid dts
Fixes Ticket1681

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopktdumper: Use a custom define instead of PATH_MAX for buffers
Martin Storsjö [Tue, 28 Aug 2012 19:56:03 +0000 (22:56 +0300)]
pktdumper: Use a custom define instead of PATH_MAX for buffers

PATH_MAX is not necessarily available on all systems, e.g. it's
normally not available on MSVC, and is not guaranteed to defined
on a POSIX system either.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agopktdumper: Use av_strlcpy instead of strncpy
Martin Storsjö [Thu, 30 Aug 2012 20:10:07 +0000 (23:10 +0300)]
pktdumper: Use av_strlcpy instead of strncpy

This takes care of null-terminating the buffer if it is too small,
which wasn't handled properly before.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agopktdumper: Use sizeof(variable) instead of the direct buffer length
Martin Storsjö [Thu, 30 Aug 2012 20:08:06 +0000 (23:08 +0300)]
pktdumper: Use sizeof(variable) instead of the direct buffer length

Also change the snprintf size to use the full buffer, since
snprintf always null-terminates the buffer.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoexamples/scaling_video: add logging in case of image allocation failure
Stefano Sabatini [Thu, 30 Aug 2012 20:44:36 +0000 (22:44 +0200)]
examples/scaling_video: add logging in case of image allocation failure

7 years agoexamples/muxing: remove pointless #undef exit
Stefano Sabatini [Thu, 30 Aug 2012 19:42:43 +0000 (21:42 +0200)]
examples/muxing: remove pointless #undef exit

7 years agofaxcompr: fix byte alignment case
Michael Niedermayer [Thu, 30 Aug 2012 20:16:17 +0000 (22:16 +0200)]
faxcompr: fix byte alignment case

Fixes Ticket1653

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/scaling_video: consistently use printf rather than av_log()
Stefano Sabatini [Thu, 30 Aug 2012 19:44:51 +0000 (21:44 +0200)]
examples/scaling_video: consistently use printf rather than av_log()

7 years agoexamples/scaling_video: add file doxy
Stefano Sabatini [Wed, 29 Aug 2012 21:40:23 +0000 (23:40 +0200)]
examples/scaling_video: add file doxy

7 years agoexamples/Makefile: give priority to pkg-config flags
Stefano Sabatini [Fri, 24 Aug 2012 14:49:04 +0000 (16:49 +0200)]
examples/Makefile: give priority to pkg-config flags

In case CFLAGS/LDLIBS are already defined and conflicting with the
pkg-config flags, give priority to the latter since they are used to
detect compilation flags.

This should fix for example the case where there are many different
instances of a library, CFLAGS=-I/foo/include and pkg-config cflags say
-I/bar/include.

7 years agox86: Fix linking with some or all of yasm, mmx, optimizations disabled
Diego Biurrun [Wed, 29 Aug 2012 09:14:17 +0000 (11:14 +0200)]
x86: Fix linking with some or all of yasm, mmx, optimizations disabled

Some optimized template functions reference optimized symbols, so they
must be explicitly disabled when those symbols are unavailable.

7 years agoconfigure: Add more fine-grained SSE CPU capabilities flags
Diego Biurrun [Tue, 28 Aug 2012 11:56:46 +0000 (13:56 +0200)]
configure: Add more fine-grained SSE CPU capabilities flags

7 years agoavfilter: x86: Use more precise compile template names
Diego Biurrun [Tue, 28 Aug 2012 12:09:35 +0000 (14:09 +0200)]
avfilter: x86: Use more precise compile template names

7 years agox86: cosmetics: Comment some #endifs for better readability
Diego Biurrun [Wed, 29 Aug 2012 13:05:53 +0000 (15:05 +0200)]
x86: cosmetics: Comment some #endifs for better readability

7 years agog723_1: add comfort noise generation
Kostya Shishkov [Thu, 23 Aug 2012 17:51:11 +0000 (19:51 +0200)]
g723_1: add comfort noise generation

7 years agolibvorbisdec: fix const nitpick warning
Michael Niedermayer [Thu, 30 Aug 2012 16:01:14 +0000 (18:01 +0200)]
libvorbisdec: fix const nitpick warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: Switch to dsputils' median prediction
Michael Niedermayer [Sat, 25 Aug 2012 21:34:39 +0000 (21:34 +0000)]
utvideoenc: Switch to dsputils' median prediction

Also, align the mangled RGB planes, which is required for the
SIMD versions of dsputils' median predict.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: Avoid writing into the input picture
Michael Niedermayer [Sat, 25 Aug 2012 21:34:35 +0000 (21:34 +0000)]
utvideoenc: Avoid writing into the input picture

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3enc: fix const correctness
Michael Niedermayer [Thu, 30 Aug 2012 15:56:38 +0000 (17:56 +0200)]
mp3enc: fix const correctness

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: remove unused variable
Michael Niedermayer [Thu, 30 Aug 2012 15:50:33 +0000 (17:50 +0200)]
utvideoenc: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 30 Aug 2012 15:28:21 +0000 (17:28 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: allow non-standard variations of linker -l/-L flags
  Add reminders to update the codec descriptor list with new codec IDs.

Conflicts:
Makefile
configure
libavcodec/avcodec.h
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavtools: remove the distinction between func_arg and func2_arg.
Anton Khirnov [Wed, 29 Aug 2012 12:37:22 +0000 (14:37 +0200)]
avtools: remove the distinction between func_arg and func2_arg.

func2_arg is the same as func_arg, except it has one additional
parameter. Change all func_arg callbacks to take that parameter (and
ignore it).

7 years agoavconv: make the -passlogfile option per-stream.
Anton Khirnov [Sun, 19 Aug 2012 07:15:48 +0000 (09:15 +0200)]
avconv: make the -passlogfile option per-stream.

7 years agoavconv: make the -pass option per-stream.
Anton Khirnov [Sun, 19 Aug 2012 06:29:44 +0000 (08:29 +0200)]
avconv: make the -pass option per-stream.

7 years agocmdutils: make -codecs print lossy/lossless flags.
Anton Khirnov [Wed, 29 Aug 2012 07:43:20 +0000 (09:43 +0200)]
cmdutils: make -codecs print lossy/lossless flags.

7 years agolavc: add lossy/lossless codec properties.
Anton Khirnov [Tue, 28 Aug 2012 09:21:59 +0000 (11:21 +0200)]
lavc: add lossy/lossless codec properties.

7 years agoswscale: fix usePal()
Michael Niedermayer [Thu, 30 Aug 2012 11:37:03 +0000 (13:37 +0200)]
swscale: fix usePal()

Fixes Ticket1702

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