Michael Niedermayer
d0b2703676
Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'
...
* commit '0b8b2ae5e93d616c2ece59f7175f483154cff918':
x86: xviddct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 11:25:22 +02:00
Michael Niedermayer
90cecd3c9b
Merge commit '4272bb6ef1533846a788c259cc498562d0704444'
...
* commit '4272bb6ef1533846a788c259cc498562d0704444':
doxy: Document avlog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 11:16:15 +02:00
Michael Niedermayer
931a4b433d
avfilter/vf_scale: change the default scaler to bicubic
...
See: [FFmpeg-devel] [PATCH] swscale/options: switch default to bicubic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 11:00:48 +02:00
Michael Niedermayer
ccf96f8c64
swscale/options: switch default to bicubic
...
Suggested-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 10:47:09 +02:00
Michael Niedermayer
6853e40106
avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits
...
Fixes Ticket2451
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 00:22:08 +02:00
Paul B Mahol
746e3142ee
avfilter/f_interleave: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 19:16:55 +00:00
Michael Niedermayer
4b05906e84
configure: add --tempprefix option
...
With this and ccache configure execution time goes down from 3.9 to 2.4 seconds
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 18:43:21 +02:00
Diego Biurrun
0b8b2ae5e9
x86: xviddct: Employ more specific ifdefs
...
This avoids building mmxext and sse2 code when disabled by configure.
2013-10-05 18:14:58 +02:00
Luca Barbato
4272bb6ef1
doxy: Document avlog
...
Provide some information for every function and add a group.
2013-10-05 18:09:45 +02:00
Paul B Mahol
fc83c99c0b
avcodec/dpx: cosmetics: fix identation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 12:27:31 +00:00
Paul B Mahol
0841652b54
avcodec/dpx: reformat avpriv_report_missing_feature messages
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 12:26:45 +00:00
Paul B Mahol
c3e0fbc507
avcodec/dpx: return proper error code for unsupported files
...
Also use avpriv_report_missing_feature().
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 12:26:21 +00:00
Paul B Mahol
9665217a75
avfilter/af_silencedetect: support more sample formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 11:59:34 +00:00
Michael Niedermayer
922596e3da
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ismindex: Change the duration field to int64_t
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 11:35:39 +02:00
Michael Niedermayer
47a57c6832
Merge commit '583a287f6f48f263859df142e6f90993e4217c72'
...
* commit '583a287f6f48f263859df142e6f90993e4217c72':
ismindex: Calculate the file duration among the included tracks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 11:29:02 +02:00
Michael Niedermayer
5de251a3e3
Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'
...
* commit 'd347a7b248d4ffdc278373fecf033b0ade030343':
ismindex: Use the individual stream duration instead of the global one
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 11:14:26 +02:00
Michael Niedermayer
a7630e3755
Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'
...
* commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38':
mov: Don't allocate arrays with av_malloc that will be realloced
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 10:50:47 +02:00
Michael Niedermayer
a927276fcc
avcodec/dpx: check packing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:41:44 +02:00
Michael Niedermayer
23f105a830
avcodec/dpx: check encoding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:41:44 +02:00
Michael Niedermayer
fb726ef09a
avcodec/dpx: fix reading of the packing field
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:33:52 +02:00
Michael Niedermayer
8cb7d20567
avcodec/dpx: fix reading 12bit dpx images, which have non zero padding bits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:31:15 +02:00
Michael Niedermayer
e1f8184a1a
avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust
...
Fixes Ticket3021
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 23:26:40 +02:00
Lukasz Marek
b611ea041d
lavd/pulse: add MAINTAINERS entry
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 23:26:40 +02:00
Martin Storsjö
a4435f9235
ismindex: Change the duration field to int64_t
...
This reduces the risk for overflow in pathlogical cases.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-05 00:01:28 +03:00
Martin Storsjö
583a287f6f
ismindex: Calculate the file duration among the included tracks
...
If the input file contains other tracks (non video/audio) that
aren't included in ismindex, the global file duration as returned
by libavformat might not be equal to the maximum of the duration
of the actual included tracks.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-05 00:01:18 +03:00
Martin Storsjö
d347a7b248
ismindex: Use the individual stream duration instead of the global one
...
The stream duration is used for calculating the duration of the
last fragment easily without manually parsing anything else than
the mfra/tfra atoms. When the global file duration was used
previously, the duration of the last fragment could end up wrong
if the streams weren't equally long.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-05 00:01:08 +03:00
Martin Storsjö
b698542ad8
mov: Don't allocate arrays with av_malloc that will be realloced
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-05 00:00:43 +03:00
Paul B Mahol
a2c14ba2b1
avfilter/vf_histogram: use const for variables that are not supposed to change
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-04 16:48:19 +00:00
Michael Niedermayer
e41ea866fc
avformat/mov: force parsing of headers if stts is absent
...
Fixes Ticket2991
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 17:47:26 +02:00
Stefano Sabatini
515e651f56
lavu/opt: fix doxy for av_opt_get* functions about return value
...
Success code must be >= 0 and not == 0, consistently with the
implementation.
2013-10-04 16:36:27 +02:00
Stefano Sabatini
719b4eef5d
lavu/common: add warning to GET_UTF8 doxy
...
Should prevent wrong uses, or at least decrease their chance.
2013-10-04 16:36:27 +02:00
Michael Niedermayer
9d8e8495c9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: fdct: Only build fdct code if encoders have been enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 14:36:58 +02:00
Michael Niedermayer
74b2b0ed9f
Merge commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e'
...
* commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e':
rtmpproto: Validate the embedded flv packet size before copying
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 14:30:05 +02:00
Michael Niedermayer
5bb3ef3b36
Merge commit '8921e32f730c191543b84e61338bc9d549aa05a3'
...
* commit '8921e32f730c191543b84e61338bc9d549aa05a3':
rtmpproto: Readjust the end of the flv buffer if handle_metadata exited early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 14:25:03 +02:00
Michael Niedermayer
b8e44118b1
Merge commit '24fee95321c1463360ba7042d026dae021854360'
...
* commit '24fee95321c1463360ba7042d026dae021854360':
rtmpproto: Move the flv header/trailer addition to append_flv_data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 14:18:32 +02:00
Michael Niedermayer
205b602135
Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'
...
* commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8':
rtmpproto: Clear the flv allocation size on reallocp failures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 14:17:53 +02:00
Michael Niedermayer
d32eec3359
Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'
...
* commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f':
rtmpproto: Pass the 'live' parameter in the right unit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 13:53:17 +02:00
Michael Niedermayer
373d15525d
Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'
...
* commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb':
rtmpproto: Print the error code string if there's no description
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 13:47:06 +02:00
Clément Bœsch
b46f19100b
cosmetics: group remaining .name and .long_name.
...
See b2bed9325
.
2013-10-04 13:33:20 +00:00
Michael Niedermayer
ee77140afa
Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'
...
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
cosmetics: Group .name and .long_name together in codec/format declarations
Conflicts:
libavcodec/8svx.c
libavcodec/alac.c
libavcodec/cljr.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dpxenc.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/ffv1dec.c
libavcodec/flacdec.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g726.c
libavcodec/gif.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopencore-amr.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/ljpegenc.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/proresdec_lgpl.c
libavcodec/proresenc_kostya.c
libavcodec/ra144enc.c
libavcodec/rawdec.c
libavcodec/rv10.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tta.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/wavpack.c
libavcodec/xbmenc.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 12:34:23 +02:00
Michael Niedermayer
f3968ab47c
Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'
...
* commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48':
oggparsevorbis: K&R formatting cosmetics
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 12:01:17 +02:00
Michael Niedermayer
90e1fc8bec
Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'
...
* commit '47b6cfc2a0333fb24f074d27830bf35ae5007050':
avformat/output-example: Declare link dependency on libswscale in the Makefile
Conflicts:
libavformat/Makefile
Changes to libavformat/Makefile are not merged as our build system for the examples
is different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 11:49:01 +02:00
Michael Niedermayer
1e67800780
Merge commit '80fefbed623491b92fe59ead99225f99c0d0ca08'
...
* commit '80fefbed623491b92fe59ead99225f99c0d0ca08':
x86: cpu: Restore some explanatory comments removed in 7160bb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 11:28:21 +02:00
Michael Niedermayer
8378aae729
Merge commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740'
...
* commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740':
atrac: Add missing av_cold
See: 852241561d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 11:22:23 +02:00
Michael Niedermayer
02a6ee5168
avfilter/vf_frei0r: fix out of array read
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 11:16:35 +02:00
Clément Bœsch
d4dc673455
avformat/vobsub: raise packet even if apparently incomplete.
...
This restore the latest packet which was dropped from the FATE test in
dbfe61100
.
2013-10-04 09:25:11 +00:00
Diego Biurrun
6cc133ec58
x86: fdct: Only build fdct code if encoders have been enabled
...
fdct is only initialized if encoders are enabled.
2013-10-04 10:50:44 +02:00
Martin Storsjö
cd818b3a57
rtmpproto: Validate the embedded flv packet size before copying
...
This wasn't an issue prior to 58404738
, when the whole RTMP packet
was copied at once and the length of the individual embedded flv
packets only were validated by the flv demuxer.
Prior to this patch, this could lead to reads and writes out of bound.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-04 09:25:10 +03:00
Martin Storsjö
8921e32f73
rtmpproto: Readjust the end of the flv buffer if handle_metadata exited early
...
If the embedded flv packets were incomplete and we aborted the
copying loop early, make sure the flv buffer is trimmed to
only contain full packets.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-04 09:25:08 +03:00
Martin Storsjö
24fee95321
rtmpproto: Move the flv header/trailer addition to append_flv_data
...
update_offset is also called from handle_metadata, where the
packet header sizes is already included in the size.
Previously this lead to flv_data/flv_size including 15 uninitialized
bytes at the end after each call to handle_metadata, making the
flv demuxer lose sync with the stream.
Also remove leftover copying in handle_metadata. This is a leftover
from the refactoring in 5840473
. (Previously this final mempcy was
the one that copied all the packets at once, while this is done
within the loop right now.) After making sure flv_size is set to
the right size, this write was out of bounds.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-04 09:25:07 +03:00