Michael Niedermayer
427bcdf035
avformat/mpegts: Use differential score for analyze()
...
This avoids high scores in random data that has a high 0x47 frequency
Fixes Ticket3844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 23:24:51 +02:00
Michael Niedermayer
b7d5e016a3
swresample: Add AVFrame based API
...
Based on commit fb1ddcdc8f
by Luca Barbato <lu_zero@gentoo.org>
Adapted for libswresample by Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 20:39:37 +02:00
Michael Niedermayer
3574d34aca
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
mpegts: always parse pcr
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 20:00:26 +02:00
Ben Hagen
6928ea7eb0
cinedec: add shutter and crop metadata
2014-08-16 19:14:49 +02:00
Michael Niedermayer
e7f3b507a3
avcodec/mips/compute_antialias_float: remove unused variable
...
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 15:58:41 +02:00
Michael Niedermayer
97bb456b6b
avcodec/hevc_mvs: dont redundantly initialize ref_idx_curr
...
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 15:58:40 +02:00
Michael Niedermayer
74c81106d2
avformat/udp: remove unneeded variable initialization
...
Found-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 15:58:40 +02:00
Michael Niedermayer
7916053ced
avformat/udp: dont mix integers with pointers
...
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 15:58:40 +02:00
Michael Niedermayer
0014541e9a
avcodec/dvbsubdec: dont mix integers with pointers
...
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 15:58:40 +02:00
Michael Niedermayer
2d7cec14be
avcodec/dvdsubdec: Dont mix integers with pointers
...
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 15:58:40 +02:00
Reimar Döffinger
bddc592001
dict.c: empty dictionaries should be a NULL pointer.
...
Ensure this is even the case if they are empty because
we failed adding the first entry.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16 14:47:06 +02:00
Reimar Döffinger
a0941c8a2b
Use new av_dict_set_int helper function.
...
Get rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16 14:31:41 +02:00
Reimar Döffinger
c2829dc925
dict.c: Add av_dict_set_int helper function.
...
This allows getting rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16 14:30:18 +02:00
Marton Balint
51748b6377
mpegts: always parse pcr
...
Previously pcr transmitted without payload but as part of the video stream was
not parsed.
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-08-16 13:24:39 +02:00
Michael Niedermayer
82e0cb360a
avformat/thp: dont mix integers with pointers
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 12:04:45 +02:00
Michael Niedermayer
65f05eff0a
avfilter/lavfutils/ff_load_image: Return error if no frame could be decoded
...
Based-on suggestion by JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 01:34:34 +02:00
Luca Barbato
96ce6d6f11
doc: Add more information in the README
...
And convert it to Markdown.
2014-08-16 00:49:22 +02:00
Clément Bœsch
11aab8d6cb
ffmpeg: look for encoding options in both avcodec and avformat
...
This patch is the same as 8a1714ad85
but
applied to encoding. It fixes the current clash of the -password option
between tta decoder and the icecast protocol.
2014-08-15 23:56:09 +02:00
Michael Niedermayer
81a663f49e
Drop remaining unneeded != NULL
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 22:47:45 +02:00
Michael Niedermayer
60dbed6067
Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'
...
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
cosmetics: Write NULL pointer inequality checks more compactly
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/h263dec.c
libavcodec/libxvid.c
libavcodec/rv10.c
libavcodec/utils.c
libavformat/format.c
libavformat/matroskadec.c
libavformat/segment.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:26:12 +02:00
Michael Niedermayer
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
Michael Niedermayer
3bb2297351
Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
...
* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6':
build: Add explanatory comments to (optimization) blocks in the Makefiles
Conflicts:
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 20:25:12 +02:00
Michael Niedermayer
c1df467d73
Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'
...
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b':
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
Conflicts:
libavcodec/h261dec.c
libavcodec/intrax8.c
libavcodec/mjpegenc.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 20:11:56 +02:00
Michael Niedermayer
9c712d0b16
vformat/utils: call flush_packet_queue() from avformat_free_context()
...
This avoids some theoretical memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 19:48:28 +02:00
Andrey Myznikov
609d5db803
Fix packet_buffer memory leak in avformat_free_context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 19:20:12 +02:00
Gabriel Dume
4b1f5e5090
cosmetics: Write NULL pointer inequality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15 05:34:13 -07:00
Michael Niedermayer
3eba0a9190
Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2'
...
* commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2':
vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 12:45:35 +02:00
Michael Niedermayer
edd0dc854d
Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'
...
* commit '7c371754fbc0dcc23bd00278b147f8095ccc5625':
atomic_win32: Drop unnecessary atomic.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 12:38:36 +02:00
Michael Niedermayer
6afd726b7b
Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'
...
* commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc':
w32pthreads: Mark functions in compatibility wrapper as av_unused
Conflicts:
compat/w32pthreads.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 12:31:29 +02:00
Gabriel Dume
f929ab0569
cosmetics: Write NULL pointer equality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15 03:18:18 -07:00
Michael Niedermayer
1e81b185ae
Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'
...
* commit '7ccb847f0f1f28199fa254847b91b6e50fb92832':
http: Reduce scope of a variable in parse_content_encoding()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 12:12:35 +02:00
Diego Biurrun
efd26bedec
build: Add explanatory comments to (optimization) blocks in the Makefiles
2014-08-15 02:55:21 -07:00
Diego Biurrun
835f798c7d
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
2014-08-15 01:26:33 -07:00
Diego Biurrun
a6a27fede9
vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()
2014-08-15 09:53:02 +02:00
Diego Biurrun
7c371754fb
atomic_win32: Drop unnecessary atomic.h #include
...
The file does not require atomic.h. Also kills function redefinition warnings.
2014-08-15 09:52:57 +02:00
Diego Biurrun
6baeadd110
w32pthreads: Mark functions in compatibility wrapper as av_unused
...
This avoids annoying warnings about unused functions. The compatibility
wrapper is designed to provide a complete (stub) API, so some functions
being unused by some files is natural and no reason for a warning.
2014-08-15 09:37:38 +02:00
Diego Biurrun
7ccb847f0f
http: Reduce scope of a variable in parse_content_encoding()
...
Also fixes an unused variable warning with zlib disabled.
2014-08-15 09:37:38 +02:00
Michael Niedermayer
d3a22491c7
ffmpeg: remove 32 channel limit from audio_channels_map
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 05:38:47 +02:00
Christophe Gisquet
33fefdb449
ffmpeg: fix streamcopy with side data
...
The issue is that, when the main packet data buffer is changed, streamcopy
uses a temporary new packet to store that buffer, frees the old packet, and
replace it with the new packet.
However, in doing so, it forgets about the side data, which gets freed, but
is still needed and referenced. Then, when the packet gets freed again in
the normal code path, it attempts to free its side data which has already
been freed.
Therefore, simply avoid the first free on side data by removing that side
data from the packet.
Fixes ticket #3773 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 03:43:17 +02:00
Michael Niedermayer
6c1ee1a114
avcodec/h261dec: Fix context initialization sequence
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 02:53:48 +02:00
Michael Niedermayer
595c63357c
Merge commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a'
...
* commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a':
h261dec: Fix order of initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 02:41:47 +02:00
Michael Niedermayer
012062cfd5
Merge commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14'
...
* commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14':
h263dec: Fix order of initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 02:28:49 +02:00
Michael Niedermayer
2fd87a3d78
Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'
...
* commit '998c9f15d1ca8c7489775ebcca51623b915988f1':
idct: remove call to ff_idctdsp_init from ff_MPV_common_init
Conflicts:
libavcodec/dnxhdenc.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 02:25:14 +02:00
Michael Niedermayer
8b6cbc3c33
avutil/opt: remove disabled old ABI compatibility code
...
Fixes some unused variable warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 20:42:53 +02:00
Michael Niedermayer
fce8817a01
avformat/format: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 20:40:11 +02:00
James Darnley
7ce6c021dc
lavc/flacdsp: change lpc_encoder function pointer prototype
...
This should help to clarify the API.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 20:11:35 +02:00
Michael Niedermayer
c6c345ea92
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/avf_showspectrum: check RDFT context init.
lavfi/avf_showspectrum: add full frame sliding mode.
lavfi/avf_showspectrum: use automatic framing.
lavfi/avf_showspectrum: do not push the frame at EOF.
lavfi/avf_showspectrum: fix output pts computation.
lavfi/avf_showspectrum: set output frame rate.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 19:42:38 +02:00
Clément Bœsch
37bfeca78c
avfilter/select: larger pixel sad computation
2014-08-14 19:11:13 +02:00
Clément Bœsch
10d96d8d66
avfilter/select: re-align a few comments
2014-08-14 18:52:53 +02:00
John Stebbins
552bc42df4
h261dec: Fix order of initialization
...
ff_MPV_common_init requires the frame dimensions which get parsed in
h261_decode_picture_header.
2014-08-14 07:58:50 -07:00