Michael Niedermayer
16310e36d9
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Avoid a null pointer dereference in avcodec_decode_video2().
Set block_align when reading QDM2 in mov.
Fix muxing QDM2 mono into caf.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 10:14:16 +02:00
Michael Niedermayer
831e749bc9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: return meaningful errors
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 10:08:43 +02:00
Michael Niedermayer
1bcfb1eea8
Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'
...
* commit '6d8629aac13692447b54eac795bf74007ebf8987':
aac: K&R formatting cosmetics
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 10:00:51 +02:00
Carl Eugen Hoyos
41f3c60fbb
Avoid a null pointer dereference in avcodec_decode_video2().
...
This could happen if oom occured while probing a file.
Reported in ticket #1900 .
2013-06-28 09:04:43 +02:00
Carl Eugen Hoyos
f91833210e
Set block_align when reading QDM2 in mov.
...
Fixes ticket #2718 .
2013-06-28 09:04:16 +02:00
Carl Eugen Hoyos
7f1b3c2ca6
Fix muxing QDM2 mono into caf.
2013-06-28 09:04:16 +02:00
Michael Niedermayer
ef90639004
avfilter/vf_mp: preserve pixel format when possible
...
Fixes Ticket2577
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 03:32:00 +02:00
Reuben Martin
86190afbda
gxf: Added codec ID to playback AVCHD
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-27 18:13:45 +02:00
Stefano Sabatini
7eb6eb03d8
lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()
...
Also improve error feedback while at it.
2013-06-27 17:46:52 +02:00
Reuben Martin
c4db4b1756
Added GXF format code to identify AVC Intra video streams. This was an extension to the origional GXF spec implemented by Grass Valley.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-27 17:40:01 +02:00
Reuben Martin
7ebf3ab959
gxf: Factorize code in get_sindex()
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-27 17:18:59 +02:00
Reuben Martin
0de9d3dd1c
gxf: Added GXF format code 25 which is used for DV codec in HD resolutions
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-27 17:18:41 +02:00
Nigel Touati-Evans
42bd0cd21a
Fix copying extradata to codec in mxfdec.c
...
The code that copies any extradata from the MXFDescriptor to the codec does
not set the size, which it should otherwise the copied data is useless.
Attached it a patch to correct this.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-27 13:32:48 +02:00
Michael Niedermayer
e4198d2fc3
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: simplify and fix flushing out old subtitles on seeking
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-27 02:01:44 +02:00
Luca Barbato
07c52e2c7c
aac: return meaningful errors
2013-06-27 01:22:36 +02:00
Luca Barbato
6d8629aac1
aac: K&R formatting cosmetics
2013-06-27 01:22:06 +02:00
Stefano Sabatini
5c616fe48b
ffprobe: always exit 1 in case of errors
...
This is consistent with the other ff* tools, and also avoids spurious
success reports when ret%256 = 0.
2013-06-27 00:20:36 +02:00
Stefano Sabatini
1fc626f8d0
ffprobe: reindent after previous commit
2013-06-27 00:20:28 +02:00
Nicolas George
a334b00cf6
ffprobe: fix exit code with stream specifiers
...
Without this fix, ffprobe would exit with a failure exit code if a stream
specifier is given that selects the last stream.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
2013-06-27 00:20:20 +02:00
Stefano Sabatini
205092bf47
ffprobe: simplify branching logic in probe_file()
2013-06-27 00:20:11 +02:00
Stefano Sabatini
80b56a7bdd
examples/muxing: rename audio/video_pts to audio/video_time
...
The new name is less confusing, since the variables represent times
rather than timestamps.
2013-06-26 23:38:42 +02:00
Stefano Sabatini
db7ebab5c3
doc/bitstream_filters: document the chomp filter
...
TODO: add some meaningful examples.
2013-06-26 23:22:48 +02:00
Stefano Sabatini
7b38c4c95f
doc/bitstream-filters.texi: add documentation for the aac_adtstoasc filter
...
Based on the notes in libavcodec/aac_adtstoasc_bsf.c.
2013-06-26 23:22:39 +02:00
Stefano Sabatini
418b9454ff
lavf/movenc: improve error feedback in case malformed AAC bitstream is detected
...
Consistent with the FLV muxer.
2013-06-26 23:22:31 +02:00
Stefano Sabatini
08b99be7c4
lavf/mux: rename variable cortag -> tagbuf2 in init_muxer()
...
Possibly enhance readibility.
2013-06-26 23:22:22 +02:00
Stefano Sabatini
47c9887eca
lavc/utils: improve feedback in case of invalid packet size
2013-06-26 23:22:13 +02:00
Stefano Sabatini
c58d535b2f
examples/Makefile: disable -O2 optimizations
...
There is no much point in optimizing example code, and the -O2 flag is
annoying when debugging.
2013-06-26 23:21:39 +02:00
Stefano Sabatini
3aa57e1582
examples/muxing: remove useless instruction
...
Simpler and less confusing.
2013-06-26 23:21:06 +02:00
Marton Balint
9fac752afa
ffplay: simplify and fix flushing out old subtitles on seeking
...
Fixes the additional issue reported in ticket #2666 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-06-26 22:30:16 +02:00
Jean Delvare
ff995e2b6f
doc/filters: Fix texi syntax
...
Commit f1efaf8371
used parentheses
instead of curly braces in texi syntax, resulting in warnings when
the documentation is generated. Fix that.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 21:23:20 +02:00
Michael Niedermayer
034b31df2c
swscale: Fix PAL8 input with alpha
...
Fixes Ticket2158
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 15:14:00 +02:00
Michael Niedermayer
ee97982408
avfilter/src_movie: Fix handling of packet size for video
...
See Ticket2556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 13:46:19 +02:00
Michael Niedermayer
87bc648930
libavfilter/src_movie: fix which packet is reset
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 13:06:11 +02:00
Carl Eugen Hoyos
1235e91b30
Require pthreads for compilation with OpenCL support.
...
Fixes a part of ticket #2422 .
Reviewed-by: James Almer
2013-06-26 09:46:09 +02:00
Carl Eugen Hoyos
35aed74fdc
Use AV_RN32 for an unaligned read in the mxg demuxer.
...
Fixes ticket #2707 .
2013-06-26 09:33:44 +02:00
wm4
e59fb3f8b1
lavf: silence max_analyze_duration warning
...
This is part of normal operation with some formats. A warning should
indicate that something is wrong, and the documentation for AV_LOG_WARNING
says: "Something somehow does not look correct."
Since this message is most likely useful for debugging only, raise the
log level accordingly.
Plus-one-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 01:36:27 +02:00
Michael Niedermayer
d3788558b0
avcodec/cllc: Fix clobbered ff_get_buffer() change
...
Issue-since: 9328ae4843
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 01:21:43 +02:00
Michael Niedermayer
73215fe30a
vf_drawbox: give all v_log() a context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 00:54:08 +02:00
Michael Niedermayer
47da9b2c51
vf_drawbox: avoid declaration in for() arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 00:52:16 +02:00
Michael Niedermayer
f1efaf8371
Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg
...
* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg :
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples
Reviewed-by: Andrey Utkin
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 00:33:41 +02:00
Paul B Mahol
ad194b0487
xa: abort if number of channels or sample rate is 0
...
Fixes #2711 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-25 22:24:55 +00:00
Luca Barbato
da8c9b324c
lxfdec: remove wrong and unneeded check
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-25 19:38:00 +00:00
Stefano Sabatini
4b6cf1ce0e
examples/muxing: vertically align
2013-06-25 21:36:53 +02:00
Stefano Sabatini
0a3589bf2f
lavc/pngdec: return meaningful error codes
2013-06-25 21:28:56 +02:00
Mark Visser
84f571e37f
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples
2013-06-25 11:38:59 -04:00
Michael Niedermayer
015cc3239a
lavfi/movie: free packet on decoder error
...
Prevents infinite loop, see Ticket2556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 13:37:40 +02:00
Michael Niedermayer
876e960d90
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Do not omit frame pointers for msvc/icl debug builds
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 11:34:48 +02:00
Michael Niedermayer
767e171c9a
Merge commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49'
...
* commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49':
configure: Do not explicitly set Oy for msvc/icl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 11:34:14 +02:00
Michael Niedermayer
7efcd531cf
Merge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'
...
* commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b':
fate: Add Canopus Lossless YUY2 test
Conflicts:
tests/fate/lossless-video.mak
tests/ref/fate/cllc-yuy2-noblock
No change as the change is already in master
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 11:27:16 +02:00
Derek Buitenhuis
11081ab6be
fate: Add Canopus Lossless YUY2 test
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 11:26:23 +02:00