Luca Barbato
d34039b171
rmenc: Drop the temporary buffer for ac3 byteswap
...
Use direcly avio_w8().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-20 12:41:33 +02:00
Luca Barbato
656e31ed87
ogg: Forward errors further
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-20 12:41:33 +02:00
Thomas Guillem
b18346817d
flac: fix realloc loop with invalid flac files
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-20 12:41:33 +02:00
Michael Niedermayer
a6df9ce615
avfilter/buffersrc: Use correct, matching deallocation function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:33:20 +02:00
Martin Storsjö
2cc3936599
dashenc: Add a publishTime field in dynamic manifests
...
This field is mandatory in dynamic manifests.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-20 13:16:45 +03:00
Michael Niedermayer
0c9e78caf4
Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'
...
* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
buffersrc: Fix resource leak on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:15:16 +02:00
Michael Niedermayer
eb8756e4b7
Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'
...
* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
avplay: Free frame and graph when memory allocation fails
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:12:03 +02:00
Michael Niedermayer
0796a2ab4f
Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'
...
* commit 'eb31256f12bf0c85aded1612551ce9230356879e':
g2meet: Support G2M5 codec variant
Conflicts:
libavcodec/version.h
See: 4ba5420e4d
2015-04-20 11:52:19 +02:00
Michael Niedermayer
57f49fa0ed
Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'
...
* commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08':
filtfmts: Avoid null pointer dereference
Conflicts:
libavfilter/filtfmts.c
See: 24326930d8
2015-04-20 11:50:39 +02:00
Michael Niedermayer
94914d6909
Merge commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354'
...
* commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354':
avutil: remove pointless bmi1 define
See: a40cee03a3
2015-04-20 11:39:59 +02:00
Michael Niedermayer
a22da5e669
Merge commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e'
...
* commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e':
aacdec: consistently use avctx for logging in decode_eld_specific_config
See: 5b75689b98
2015-04-20 11:39:06 +02:00
Michael Niedermayer
fc83ff80b4
Merge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449'
...
* commit '3d71b1f8f09fccea7158e868fb9bd81b81205449':
mpegvideo_enc: Simplify picture allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 11:29:43 +02:00
Michael Niedermayer
924a77fb4e
Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'
...
* commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0':
motion_est: Fix warning from zero_cmp() assignment
See: ea41e6d637
2015-04-20 11:28:55 +02:00
Michael Niedermayer
127f7aa401
Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797'
...
* commit '4d593896aaa81356def8993e8c52294bd8bb2797':
vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()
Conflicts:
libavcodec/vc1_pred.c
See: 6c5bd7d785
2015-04-20 11:17:36 +02:00
Michael Niedermayer
4d50d53a6d
Merge commit '9286de045968ad456d4e752651eec22de5e89060'
...
* commit '9286de045968ad456d4e752651eec22de5e89060':
mov: Double-check that alias path is not an absolute path
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 11:03:32 +02:00
Michael Niedermayer
82d9c4e578
Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'
...
* commit '376589e5dd72aa2dd42500f456fca303fcdcad85':
mov: Read alternate absolute path in dref alis
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 05:51:40 +02:00
Michael Niedermayer
5a284d076f
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
...
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 05:28:13 +02:00
Michael Niedermayer
fcca7671e2
Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'
...
* commit 'e6fb844f7b736e72da364032d251283bce9e63ad':
Implement shared parsing of INFO tag in Canopus family
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 05:19:46 +02:00
Michael Niedermayer
f1db984288
Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'
...
* commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c':
fate: Prefix cllc tests with canopus
Conflicts:
tests/fate/lossless-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 05:19:03 +02:00
Michael Niedermayer
1fa7d0902c
Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'
...
* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
hqx: Implement slice-threaded decoding
Conflicts:
libavcodec/hqx.c
libavcodec/hqx.h
See: eff72a6c73
2015-04-20 05:11:48 +02:00
Michael Niedermayer
55b866f618
Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'
...
* commit '453642f8afe9f979fcc813a246b1ec656ec36a93':
hqx: Store shareable data in main decoder context
Conflicts:
libavcodec/hqx.c
libavcodec/hqx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 04:57:06 +02:00
Michael Niedermayer
d8b4e9adbb
Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'
...
* commit 'ea031b75fb50c59196ccb654c9d143fb75365da9':
hqx: Move DSP related code to a separate file
Conflicts:
libavcodec/hqx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 04:33:06 +02:00
Michael Niedermayer
73e6af9d7b
Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'
...
* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
hqx: Merge invalid format check within switch block
Conflicts:
libavcodec/hqx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 04:29:58 +02:00
Michael Niedermayer
dbd94b771f
avcodec/internal: Fix ff_dlog() define like av_dlog()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 04:27:08 +02:00
Michael Niedermayer
0a582aeee4
avcodec: fix build with DEBUG/TRACE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 04:11:23 +02:00
Michael Niedermayer
8f7b022c8c
Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'
...
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
lavc: Replace av_dlog and tprintf with internal macros
Conflicts:
libavcodec/aacdec.c
libavcodec/audio_frame_queue.c
libavcodec/bitstream.c
libavcodec/dcadec.c
libavcodec/dnxhddec.c
libavcodec/dvbsubdec.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/get_bits.h
libavcodec/gifdec.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/imc.c
libavcodec/interplayvideo.c
libavcodec/jpeglsdec.c
libavcodec/libopencore-amr.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_parser.c
libavcodec/pngdec.c
libavcodec/ratecontrol.c
libavcodec/rv10.c
libavcodec/svq1dec.c
libavcodec/vqavideo.c
libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 04:10:10 +02:00
Michael Niedermayer
40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
...
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 03:19:47 +02:00
Michael Niedermayer
8e8219e0f0
Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'
...
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
log: Introduce a more verbose debug level
Conflicts:
doc/APIchanges
doc/fftools-common-opts.texi
libavutil/log.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 02:48:19 +02:00
Federico Tomassetti
386e2755aa
jack: Check memory allocation
...
Bug-Id: CID 1265785
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 23:50:48 +01:00
Federico Tomassetti
617814b4a7
buffersrc: Fix resource leak on error
...
Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 23:50:46 +01:00
Federico Tomassetti
336d2f0979
avplay: Free frame and graph when memory allocation fails
...
Bug-Id: CID 1291564
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 23:45:35 +01:00
Eric Zimmerman
eb31256f12
g2meet: Support G2M5 codec variant
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 23:45:35 +01:00
Himangi Saraogi
88d1fb4e3f
filtfmts: Avoid null pointer dereference
2015-04-19 23:45:35 +01:00
James Almer
a1d58e3b38
avutil: remove pointless bmi1 define
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-19 23:45:35 +01:00
Andreas Cadhalpun
09bd7ddf20
aacdec: consistently use avctx for logging in decode_eld_specific_config
...
ac may be NULL and then accessing ac->avctx results in a segmentation fault.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-04-19 23:45:35 +01:00
Vittorio Giovara
3d71b1f8f0
mpegvideo_enc: Simplify picture allocation
2015-04-19 23:17:56 +01:00
Vittorio Giovara
0251c9be5a
motion_est: Fix warning from zero_cmp() assignment
...
warning: incompatible
pointer types assigning to 'me_cmp_func' (aka 'int (*)(struct
MpegEncContext *, uint8_t *, uint8_t *, ptrdiff_t, int)') from 'int
(MpegEncContext *, uint8_t *, uint8_t *, int, int)'
[-Wincompatible-pointer-types]
2015-04-19 23:17:56 +01:00
Vittorio Giovara
4d593896aa
vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()
...
Fix a rather lengthy initialization warning from clang.
2015-04-19 23:17:56 +01:00
Vittorio Giovara
9286de0459
mov: Double-check that alias path is not an absolute path
...
nlvl_to and nlvl_from can be set to 1 if both alias and target files
are in the same directory, so actually check the first character of the
string. We can do this because MacOS filepaths (alis type 2) are always
converted to UNIX filepaths (alis type 18).
2015-04-19 22:50:24 +01:00
Vittorio Giovara
376589e5dd
mov: Read alternate absolute path in dref alis
...
Absolute paths can be stored in alis type 2 and 18 according to my research:
the first is the canonical MacOS filepath, with path level separated by
colons, and the volume name within the filepath, while the second should be the
absolute filesystem path from the mount point.
2015-04-19 22:48:14 +01:00
Michael Niedermayer
93db2708d3
ffmpeg: Fix null pointer dereference in do_video_out()
...
Fixes: CID1295087
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19 23:44:19 +02:00
Vittorio Giovara
22526c1f55
Canopus HQ/HQA decoder
...
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 22:37:23 +01:00
Vittorio Giovara
e6fb844f7b
Implement shared parsing of INFO tag in Canopus family
...
Add some bounds checking to CLLC; reduce HQX variable scoping,
add an error message.
2015-04-19 22:37:02 +01:00
Vittorio Giovara
fcda30f2dc
fate: Prefix cllc tests with canopus
...
They belong to the same family of codecs.
2015-04-19 22:36:50 +01:00
Vittorio Giovara
5b5338f6d1
hqx: Implement slice-threaded decoding
...
Inspired by a patch from Ferdinand Oeinck <ferdo@demon.nl>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 22:36:48 +01:00
Vittorio Giovara
453642f8af
hqx: Store shareable data in main decoder context
...
In preparation for multithreaded decoding.
2015-04-19 22:36:41 +01:00
Michael Niedermayer
0cab0931dc
avformat/matroskadec: remove now duplicate doctype check
...
See: b8d7f3186ed9fe6b926c
2015-04-19 16:47:12 +02:00
Michael Niedermayer
9a0f60a0f8
avcodec/mpeg4videodec: Use check_marker()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19 15:34:43 +02:00
Michael Niedermayer
22c0585a00
avformat/http: Fix 2 typos
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19 14:26:40 +02:00
Vittorio Giovara
ea031b75fb
hqx: Move DSP related code to a separate file
2015-04-19 12:41:59 +01:00
