ffmpeg.git
7 years agolswr: improve rematrixing error message.
Nicolas George [Mon, 31 Dec 2012 11:12:23 +0000 (12:12 +0100)]
lswr: improve rematrixing error message.

Report channel layout/count for insufficiently determined
rematrixing.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 31 Dec 2012 13:15:42 +0000 (14:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: suppress -fPIC in msvc builds
  Drop unnecessary 'l' length modifier when printfing double values.
  truemotion2: Sanitize tm2_read_header()

Conflicts:
libavcodec/truemotion2.c
libavfilter/src_movie.c
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'
Michael Niedermayer [Mon, 31 Dec 2012 12:40:15 +0000 (13:40 +0100)]
Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'

* commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01':
  FATE: add cavs test
  cavsdec: export picture type in the output frame

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7d8482640058d66867602a6f58446c9342d9d146'
Michael Niedermayer [Mon, 31 Dec 2012 12:26:12 +0000 (13:26 +0100)]
Merge commit '7d8482640058d66867602a6f58446c9342d9d146'

* commit '7d8482640058d66867602a6f58446c9342d9d146':
  cavs: deMpegEncContextize

Note, the bugfixes have all been in FFmpeg previously, this just switches away
from MpegEncContext

Conflicts:
libavcodec/cavs.c
libavcodec/cavsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'
Michael Niedermayer [Mon, 31 Dec 2012 12:14:06 +0000 (13:14 +0100)]
Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'

* commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8':
  cavs: cosmetics, reformat top part
  cavsdec: cosmetics, reformat
  libavcodec/utils: Add braces to shut up gcc warnings

Conflicts:
libavcodec/cavsdec.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/textdec: fix subviewer1 preproc check.
Clément Bœsch [Mon, 31 Dec 2012 12:06:29 +0000 (13:06 +0100)]
lavc/textdec: fix subviewer1 preproc check.

7 years agoconfigure: suppress -fPIC in msvc builds
Hendrik Leppkes [Tue, 30 Oct 2012 21:57:37 +0000 (22:57 +0100)]
configure: suppress -fPIC in msvc builds

MSVC doesn't understand the option, and emits a warning on every
call to cl.exe.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoDrop unnecessary 'l' length modifier when printfing double values.
Diego Biurrun [Sun, 30 Dec 2012 23:29:36 +0000 (00:29 +0100)]
Drop unnecessary 'l' length modifier when printfing double values.

%f denotes a double argument and 'l' does nothing in this case
according to the C spec.

7 years agotruemotion2: Sanitize tm2_read_header()
Diego Biurrun [Sun, 23 Dec 2012 17:43:19 +0000 (18:43 +0100)]
truemotion2: Sanitize tm2_read_header()

Also give a variable a more sensible name.

7 years agolavc: correctly set AVSubtitle format for text based subtitles.
Clément Bœsch [Mon, 31 Dec 2012 09:08:27 +0000 (10:08 +0100)]
lavc: correctly set AVSubtitle format for text based subtitles.

7 years agolavc/utils: reindent in avcodec_decode_subtitle2().
Clément Bœsch [Mon, 31 Dec 2012 09:06:32 +0000 (10:06 +0100)]
lavc/utils: reindent in avcodec_decode_subtitle2().

7 years agoSony Wave64 muxer
Paul B Mahol [Fri, 28 Dec 2012 13:40:55 +0000 (13:40 +0000)]
Sony Wave64 muxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoChangelog: remove av_{base,dir}_name addition.
Clément Bœsch [Mon, 31 Dec 2012 01:33:18 +0000 (02:33 +0100)]
Changelog: remove av_{base,dir}_name addition.

This belongs only to APIChanges, where it is already present.

Spotted-by: Stefano
7 years agolavfi/Makefile: add missing dependencies to FFLIBS.
Clément Bœsch [Mon, 31 Dec 2012 00:40:34 +0000 (01:40 +0100)]
lavfi/Makefile: add missing dependencies to FFLIBS.

7 years agolavfi/Makefile: make FFLIBS list consistent.
Clément Bœsch [Mon, 31 Dec 2012 00:38:31 +0000 (01:38 +0100)]
lavfi/Makefile: make FFLIBS list consistent.

7 years agomicrodvd: sanitize AVPackets.
Clément Bœsch [Sat, 29 Dec 2012 22:26:36 +0000 (23:26 +0100)]
microdvd: sanitize AVPackets.

Current MicroDVD AVPackets contain timing information and trailing line
breaks. The data is now only composed of the markup data. Doing this
consistently between text subtitles decoders allows to use different
codec for various formats. For instance, MicroDVD markup is sometimes
found in some VPlayer files. Also, generally speaking, the subtitles
text decoders have no use of these timings (and they must not use them
since it would break any user timing adjustment).

Technically, this is a major ABI break. In practice, a mismatching
lavf/lavc will now error out for MicroDVD decoding. Supporting both
formats requires unnecessary complex and fragile code.

FATE needs update because line breaks in the ASS file were "\n" (because
that's what is used in the original file). ASS format expect "\r\n" line
breaks; this commit fixes this issue. Also note that this "\r\n"
trailing need to be moved at some point from the decoders to the ASS
muxer.

7 years agoAdd SubViewer v1 subtitles demuxer and decoder.
Clément Bœsch [Fri, 28 Dec 2012 23:04:44 +0000 (00:04 +0100)]
Add SubViewer v1 subtitles demuxer and decoder.

7 years agoAdd PJS subtitles demuxer and decoder.
Clément Bœsch [Fri, 28 Dec 2012 04:15:00 +0000 (05:15 +0100)]
Add PJS subtitles demuxer and decoder.

7 years agoFATE: disable fate-sub-mpsub temporarly.
Clément Bœsch [Sun, 30 Dec 2012 22:42:50 +0000 (23:42 +0100)]
FATE: disable fate-sub-mpsub temporarly.

Sample has been forgotten, revert this commit in a day or two, when
sample is available everywhere.

7 years agoAdd AQTitle subtitles demuxer.
Clément Bœsch [Fri, 28 Dec 2012 02:49:02 +0000 (03:49 +0100)]
Add AQTitle subtitles demuxer.

7 years agolavf/subtitles: fix CLRF/CRLF typo.
Clément Bœsch [Sun, 30 Dec 2012 22:14:34 +0000 (23:14 +0100)]
lavf/subtitles: fix CLRF/CRLF typo.

7 years agoAdd MPlayer subtitles demuxer.
Clément Bœsch [Fri, 28 Dec 2012 00:38:50 +0000 (01:38 +0100)]
Add MPlayer subtitles demuxer.

7 years agolavf: move srtdec:read_chunk() to subtitles utils.
Clément Bœsch [Fri, 28 Dec 2012 00:15:01 +0000 (01:15 +0100)]
lavf: move srtdec:read_chunk() to subtitles utils.

This function can be useful for various other subtitles formats.

7 years ago10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.
Clément Bœsch [Sun, 30 Dec 2012 21:54:53 +0000 (22:54 +0100)]
10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.

Both libavformat and libavcodec requires this function.

7 years agoAdd VPlayer subtitles demuxer and decoder.
Clément Bœsch [Thu, 27 Dec 2012 21:36:47 +0000 (22:36 +0100)]
Add VPlayer subtitles demuxer and decoder.

Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.

7 years agoAdd MPL2 subtitles demuxer and decoder.
Clément Bœsch [Thu, 27 Dec 2012 13:49:33 +0000 (14:49 +0100)]
Add MPL2 subtitles demuxer and decoder.

7 years agolavc/avcodec: fix FF_INPUT_/BUFFER_/PADDING_SIZE typo.
Clément Bœsch [Sun, 30 Dec 2012 21:20:18 +0000 (22:20 +0100)]
lavc/avcodec: fix FF_INPUT_/BUFFER_/PADDING_SIZE typo.

7 years agoffserver: add missing padding to extradata.
Clément Bœsch [Sun, 30 Dec 2012 21:19:51 +0000 (22:19 +0100)]
ffserver: add missing padding to extradata.

7 years agolavc: add ff_bprint_to_extradata() helper and use it.
Clément Bœsch [Sat, 29 Dec 2012 21:09:59 +0000 (22:09 +0100)]
lavc: add ff_bprint_to_extradata() helper and use it.

This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.

At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.

7 years agolavc/srtenc: just like the decoder, mark SRT encoder as deprecated.
Clément Bœsch [Sun, 30 Dec 2012 20:34:00 +0000 (21:34 +0100)]
lavc/srtenc: just like the decoder, mark SRT encoder as deprecated.

7 years agolavc/srtenc: do not add trailing line breaks with SubRip.
Clément Bœsch [Sat, 29 Dec 2012 23:56:48 +0000 (00:56 +0100)]
lavc/srtenc: do not add trailing line breaks with SubRip.

The SRT muxer is reponsible for separating events with two line breaks,
there is no need to add more than necessary. Similarly, other muxers
(such as Matroska) are not supposed to add line breaks at the end of the
payload.

7 years agolavf/srtdec: remove line break hack.
Clément Bœsch [Sat, 29 Dec 2012 22:50:56 +0000 (23:50 +0100)]
lavf/srtdec: remove line break hack.

This is not necessary anymore since the last commit.

7 years agolavc/srtdec: make some sscanf to work at the end of a line.
Clément Bœsch [Sat, 29 Dec 2012 22:50:08 +0000 (23:50 +0100)]
lavc/srtdec: make some sscanf to work at the end of a line.

Fix sscanf calls that can't work at the end of a line unless it ends
with \r\n or \n: the markup line may/should/must not end with these
characters.

7 years agoFATE: add cavs test
Anton Khirnov [Fri, 28 Dec 2012 05:20:01 +0000 (06:20 +0100)]
FATE: add cavs test

7 years agocavsdec: export picture type in the output frame
Anton Khirnov [Fri, 28 Dec 2012 05:19:12 +0000 (06:19 +0100)]
cavsdec: export picture type in the output frame

7 years agocavs: deMpegEncContextize
Anton Khirnov [Thu, 27 Dec 2012 16:12:10 +0000 (17:12 +0100)]
cavs: deMpegEncContextize

It does not use any of the mpegvideo infrastructure, just a few fields
from the context.

Fixes a segfault with the emu edge flag, since emu edge buffer is now
allocated as a part of the frame buffer allocation and cavs calls
ff_get_buffer() directly, it does not use mpegvideo buffer management.

Fixes a memleak of the last frame.

7 years agocavs: cosmetics, reformat top part
Anton Khirnov [Thu, 27 Dec 2012 13:16:25 +0000 (14:16 +0100)]
cavs: cosmetics, reformat top part

7 years agocavsdec: cosmetics, reformat
Anton Khirnov [Thu, 27 Dec 2012 12:57:56 +0000 (13:57 +0100)]
cavsdec: cosmetics, reformat

7 years agolavfi/sink_buffer: switch to filter_frame.
Nicolas George [Wed, 26 Dec 2012 23:43:12 +0000 (00:43 +0100)]
lavfi/sink_buffer: switch to filter_frame.

7 years agolavfi/video: ensure that filter_frame is called.
Nicolas George [Wed, 26 Dec 2012 23:42:51 +0000 (00:42 +0100)]
lavfi/video: ensure that filter_frame is called.

This is a temporary workaround until all filters have been
upgraded to filter_frame and the framework can forget completely
about start_frame/draw_slice/end_frame.

7 years agogifdec: use transparent instead of background color index
Don Moir [Sun, 30 Dec 2012 17:21:25 +0000 (17:21 +0000)]
gifdec: use transparent instead of background color index

Wrong code was commited in 64f4fb75c4cea6b33b5fd5b135c19950df9a7154.

7 years agovf_tinterlace: dont mix declarations and expressions
Michael Niedermayer [Sun, 30 Dec 2012 15:59:52 +0000 (16:59 +0100)]
vf_tinterlace: dont mix declarations and expressions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: remove some draw_slice related code that has become unneeded
Michael Niedermayer [Thu, 27 Dec 2012 00:13:42 +0000 (01:13 +0100)]
lavfi: remove some draw_slice related code that has become unneeded

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/tinterlace: add low-pass-filter for top/bottom interleave modes
Mark Himsley [Sun, 30 Dec 2012 14:02:16 +0000 (15:02 +0100)]
lavfi/tinterlace: add low-pass-filter for top/bottom interleave modes

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agodoc/filters: drop duplicated description of resampler options in aresample docs
Stefano Sabatini [Wed, 26 Dec 2012 00:44:47 +0000 (01:44 +0100)]
doc/filters: drop duplicated description of resampler options in aresample docs

Avoid duplication, and point to the complete description of options.
Also provide a more complete specification of the supported syntax.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Dec 2012 13:29:15 +0000 (14:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  snow: use VideoDSPContext

Conflicts:
libavcodec/snow.c

Nothing merged here, this has already been fixed in ffmpeg long ago

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '30a76487304e7250294c9c0e9fa179bf07fd822a'
Michael Niedermayer [Sun, 30 Dec 2012 13:21:50 +0000 (14:21 +0100)]
Merge commit '30a76487304e7250294c9c0e9fa179bf07fd822a'

* commit '30a76487304e7250294c9c0e9fa179bf07fd822a':
  hlsenc: make segment number unsigned
  hlsenc: make EXT-X-MEDIA-SEQUENCE always increase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9b1370aced385698bc783747917544ab69ecb373'
Michael Niedermayer [Sun, 30 Dec 2012 13:11:11 +0000 (14:11 +0100)]
Merge commit '9b1370aced385698bc783747917544ab69ecb373'

* commit '9b1370aced385698bc783747917544ab69ecb373':
  hlsenc: do not add timestamps in different timebases
  hlsenc: use the correct AV_TIME_BASE macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'
Michael Niedermayer [Sun, 30 Dec 2012 13:02:14 +0000 (14:02 +0100)]
Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'

* commit '0448f26c97c5ab4858d31e456a4f1738ae783242':
  hlsenc: keep the playlist to the correct number of items
  hlsenc: use the segment filename in the playlist entry

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'
Michael Niedermayer [Sun, 30 Dec 2012 12:54:50 +0000 (13:54 +0100)]
Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'

* commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405':
  hlsenc: check append_entry return value
  hlsenc: use the basename to generate the list entries
  avstring: add av_basename and av_dirname

Conflicts:
Changelog
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge back some registering macros in all*.c.
Clément Bœsch [Sun, 30 Dec 2012 06:17:33 +0000 (07:17 +0100)]
Merge back some registering macros in all*.c.

This breaks the sed in configure:find_things(). Fixes regression from
c73c87b. Fixes Ticket2079.

Found-by: jamal
7 years agolavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().
Clément Bœsch [Sun, 30 Dec 2012 05:53:48 +0000 (06:53 +0100)]
lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().

This is consistent with the other ff_ass_split_* functions.

It also fixes a crash when trying to split a dialog with text=NULL
(which seems to happen when the text of the dialog is empty); basically,
this commit fixes crashes when trying to encode an empty text subtitle
dialog (see subrip and mov_text encoders).

Fixes Ticket2048.

7 years agoaacdec: make dual mono mode selectable through AVOptions too.
Michael Niedermayer [Sun, 30 Dec 2012 04:07:12 +0000 (05:07 +0100)]
aacdec: make dual mono mode selectable through AVOptions too.

Based on patch by Akihiro Tsukada

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacdec: simplify dmono
Michael Niedermayer [Sun, 30 Dec 2012 03:55:14 +0000 (04:55 +0100)]
aacdec: simplify dmono

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacdec: fix dual mono
Michael Niedermayer [Sun, 30 Dec 2012 03:43:44 +0000 (04:43 +0100)]
aacdec: fix dual mono

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: postproc cleanup.
Clément Bœsch [Mon, 24 Dec 2012 05:08:07 +0000 (06:08 +0100)]
build: postproc cleanup.

This reverts 79f80f5c, moves postproc along with the other libraries,
and fix the postproc dependency to libavutil.

7 years agolibavcodec/utils: Add braces to shut up gcc warnings
Diego Biurrun [Fri, 28 Dec 2012 18:06:04 +0000 (19:06 +0100)]
libavcodec/utils: Add braces to shut up gcc warnings

libavcodec/utils.c:1050:5: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/utils.c:1314:5: warning: missing braces around initializer [-Wmissing-braces]

7 years agosws: fix warning: cast from pointer to integer of different size
Michael Niedermayer [Sat, 29 Dec 2012 19:50:43 +0000 (20:50 +0100)]
sws: fix warning: cast from pointer to integer of different size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_deshake: fix strict aliassing errors
Michael Niedermayer [Sat, 29 Dec 2012 19:00:48 +0000 (20:00 +0100)]
vf_deshake: fix strict aliassing errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: fix warning: assignment from incompatible pointer type
Michael Niedermayer [Sat, 29 Dec 2012 18:39:14 +0000 (19:39 +0100)]
swscale: fix warning: assignment from incompatible pointer type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomotion_est_template: fix warning: "ASSERT_LEVEL" is not defined
Michael Niedermayer [Sat, 29 Dec 2012 18:37:20 +0000 (19:37 +0100)]
motion_est_template: fix warning: "ASSERT_LEVEL" is not defined
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobktr: fix warning: missing braces around initializer
Michael Niedermayer [Sat, 29 Dec 2012 18:27:07 +0000 (19:27 +0100)]
bktr: fix warning: missing braces around initializer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix OS/2 threading
Dave Yeo [Sat, 29 Dec 2012 01:53:43 +0000 (17:53 -0800)]
Fix OS/2 threading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized...
Michael Niedermayer [Sat, 29 Dec 2012 02:20:37 +0000 (03:20 +0100)]
avf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized use.

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavdec: fix duration calculation for files with invalid data size
James Almer [Thu, 27 Dec 2012 22:30:40 +0000 (19:30 -0300)]
wavdec: fix duration calculation for files with invalid data size

Some wav files report a data size that is bigger than the actual file size.
Fall back to estimation from bitrate in such cases.

Fixes ticket #2065.

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agosnow: use VideoDSPContext
Luca Barbato [Sat, 29 Dec 2012 17:05:49 +0000 (18:05 +0100)]
snow: use VideoDSPContext

It was left over from the initial conversion.

7 years agohlsenc: make segment number unsigned
Luca Barbato [Sat, 29 Dec 2012 11:31:01 +0000 (12:31 +0100)]
hlsenc: make segment number unsigned

It will overflow if somebody keeps streaming for a time long enough.

7 years agohlsenc: do not add timestamps in different timebases
Luca Barbato [Sat, 29 Dec 2012 10:46:01 +0000 (11:46 +0100)]
hlsenc: do not add timestamps in different timebases

start_time is in stream timebase units while end_time is
in AV_TIME_BASE ones.

7 years agohlsenc: keep the playlist to the correct number of items
Luca Barbato [Tue, 25 Dec 2012 09:05:42 +0000 (10:05 +0100)]
hlsenc: keep the playlist to the correct number of items

Consider the corner case with a list size larger than the wrap
number.

7 years agohlsenc: make EXT-X-MEDIA-SEQUENCE always increase
Kanglin [Sat, 29 Dec 2012 11:09:17 +0000 (12:09 +0100)]
hlsenc: make EXT-X-MEDIA-SEQUENCE always increase

7 years agohlsenc: use the correct AV_TIME_BASE macro
Kanglin [Sat, 29 Dec 2012 10:44:33 +0000 (11:44 +0100)]
hlsenc: use the correct AV_TIME_BASE macro

recording_time is in AV_TIME_BASE units.

7 years agohlsenc: check append_entry return value
Luca Barbato [Tue, 25 Dec 2012 07:59:38 +0000 (08:59 +0100)]
hlsenc: check append_entry return value

7 years agohlsenc: use the segment filename in the playlist entry
Luca Barbato [Tue, 25 Dec 2012 08:14:59 +0000 (09:14 +0100)]
hlsenc: use the segment filename in the playlist entry

Avoid calling av_get_frame_filename twice, once to generate the
segment filename and once to generate the playlist.

7 years agohlsenc: use the basename to generate the list entries
Luca Barbato [Sun, 23 Dec 2012 23:08:35 +0000 (00:08 +0100)]
hlsenc: use the basename to generate the list entries

The segment path is desumed from the playlist path, recording a
relative path in the playlist while serving the file could lead
to misleading results.

7 years agoavstring: add av_basename and av_dirname
Luca Barbato [Sun, 23 Dec 2012 20:25:24 +0000 (21:25 +0100)]
avstring: add av_basename and av_dirname

Thread safe version of the common basename and dirname.

7 years agolavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()
Michael Niedermayer [Sat, 29 Dec 2012 14:37:05 +0000 (15:37 +0100)]
lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 29 Dec 2012 13:27:38 +0000 (14:27 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files

Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavfilter/allfilters.c
libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '69583bd3b1eba471366141c945030c163e073e02'
Michael Niedermayer [Sat, 29 Dec 2012 12:05:37 +0000 (13:05 +0100)]
Merge commit '69583bd3b1eba471366141c945030c163e073e02'

* commit '69583bd3b1eba471366141c945030c163e073e02':
  avfilter: Refactor unconditional filter registration
  build: Add rtpenc_chain extra config option
  configure: Add --disable-all command line option

Conflicts:
libavfilter/allfilters.c
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 29 Dec 2012 03:34:23 +0000 (04:34 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix type of time_diff in waveform display
  ffplay: always display audio visualization if mode is set
  ffplay: hide cursor on no mouse movement
  ffplay: reset external clock to unknown on start
  ffplay: only drop frames if not in frame step mode
  ffplay: move frame step pause from the video thread to video_refresh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxtea: fix unused variable warning for config_small
Michael Niedermayer [Sat, 29 Dec 2012 02:37:46 +0000 (03:37 +0100)]
xtea: fix unused variable warning for config_small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsmpeg4enc: fix possible use of uninitialized warning
Michael Niedermayer [Sat, 29 Dec 2012 02:06:08 +0000 (03:06 +0100)]
msmpeg4enc: fix possible use of uninitialized warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohpel_motion_search: move code used for asserts under correct #if
Michael Niedermayer [Sat, 29 Dec 2012 01:51:51 +0000 (02:51 +0100)]
hpel_motion_search: move code used for asserts under correct #if

This avoids compiler warnings about set but not used variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoivi_common: Fix use of uninitialized warnings
Michael Niedermayer [Sat, 29 Dec 2012 01:44:43 +0000 (02:44 +0100)]
ivi_common: Fix use of uninitialized warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavs: silence "may be used uninitialized" warnings
Michael Niedermayer [Sat, 29 Dec 2012 01:42:30 +0000 (02:42 +0100)]
avs: silence "may be used uninitialized" warnings

We initialize the struct to 0 to also ensure any actual use of
the pointers in it will not lead to security issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agommfenc: use ff_raw_write_packet()
Paul B Mahol [Fri, 28 Dec 2012 22:18:48 +0000 (22:18 +0000)]
mmfenc: use ff_raw_write_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoaiffenc: use ff_raw_write_packet()
Paul B Mahol [Fri, 28 Dec 2012 22:06:39 +0000 (22:06 +0000)]
aiffenc: use ff_raw_write_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosoxenc: use ff_raw_write_packet()
Paul B Mahol [Fri, 28 Dec 2012 21:57:01 +0000 (21:57 +0000)]
soxenc: use ff_raw_write_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosoxdec: use meaningful error codes
Paul B Mahol [Fri, 28 Dec 2012 21:50:42 +0000 (21:50 +0000)]
soxdec: use meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosoxenc: use ffio_fill
Paul B Mahol [Fri, 28 Dec 2012 21:47:47 +0000 (21:47 +0000)]
soxenc: use ffio_fill

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosoxenc: use FFALIGN
Paul B Mahol [Fri, 28 Dec 2012 21:36:03 +0000 (21:36 +0000)]
soxenc: use FFALIGN

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoh264: avoid a grayscale related if() in hl_decode_mb()
Michael Niedermayer [Fri, 28 Dec 2012 19:38:41 +0000 (20:38 +0100)]
h264: avoid a grayscale related if() in hl_decode_mb()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: fix type of time_diff in waveform display
Marton Balint [Tue, 25 Dec 2012 23:26:59 +0000 (00:26 +0100)]
ffplay: fix type of time_diff in waveform display

Fixes time diff overflow visible as showing the same few waveforms in a loop at
the end of file.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: always display audio visualization if mode is set
Marton Balint [Tue, 25 Dec 2012 23:06:19 +0000 (00:06 +0100)]
ffplay: always display audio visualization if mode is set

Fixes ticket #1903.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: hide cursor on no mouse movement
Marton Balint [Sat, 1 Dec 2012 01:27:29 +0000 (02:27 +0100)]
ffplay: hide cursor on no mouse movement

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: reset external clock to unknown on start
Marton Balint [Thu, 20 Dec 2012 23:32:18 +0000 (00:32 +0100)]
ffplay: reset external clock to unknown on start

Fixes a delay and initial frame drops on starting realtime streams with
external clock.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: only drop frames if not in frame step mode
Marton Balint [Wed, 26 Dec 2012 18:53:58 +0000 (19:53 +0100)]
ffplay: only drop frames if not in frame step mode

Fixes ticket #2053.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: move frame step pause from the video thread to video_refresh
Marton Balint [Tue, 25 Dec 2012 21:35:53 +0000 (22:35 +0100)]
ffplay: move frame step pause from the video thread to video_refresh

This way we pause the video right after we displayed a new frame. Partially
fixes ticket #2053.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agocosmetics: Prettyprint codec/format/filter registration files
Diego Biurrun [Tue, 25 Dec 2012 14:29:39 +0000 (15:29 +0100)]
cosmetics: Prettyprint codec/format/filter registration files

7 years agoavfilter: Refactor unconditional filter registration
Diego Biurrun [Sun, 23 Dec 2012 18:06:35 +0000 (19:06 +0100)]
avfilter: Refactor unconditional filter registration

7 years agobuild: Add rtpenc_chain extra config option
Diego Biurrun [Thu, 29 Nov 2012 09:34:54 +0000 (10:34 +0100)]
build: Add rtpenc_chain extra config option

Also fixes linking in various configs with only individual parts enabled
because the RTP muxer chaining code depends on the general RTP code,
which is now accounted for.