Michael Niedermayer
7ca10d10aa
Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'
...
* commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e':
movenc: Factorize writing ftyp and other identification tags to a separate function
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03 01:18:54 +01:00
Martin Storsjö
355d01a1bf
movenc: Factorize writing ftyp and other identification tags to a separate function
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03 01:18:28 +02:00
Giorgio Vazzana
a3ab87427c
avutil/camellia: cosmetic fixes
...
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 21:24:02 +01:00
Giorgio Vazzana
fbb792f90f
avutil/camellia: use K[2] instead of *K in generate_round_keys()
...
Additionally, change parameters order.
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 21:23:56 +01:00
Giorgio Vazzana
8e38b1539e
avutil/camellia: make LR128() more robust
...
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 21:23:50 +01:00
Giorgio Vazzana
88d19d240a
avutil/camellia: fix documentation for av_camellia_crypt()
...
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 21:23:45 +01:00
Nicolas George
55763b6f5e
lavd/lavfi: allow to extract subcc.
...
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 20:17:05 +01:00
Supraja Meedinti
c6bb651bce
libavutil: Added Camellia symmetric block cipher
...
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version of this patch reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 15:19:36 +01:00
Michael Niedermayer
4c7a1ccb36
Changelog: Add cropdetect non 8bpp
...
Suggested-by: Reimar
Previous patch reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 14:44:31 +01:00
Clément Bœsch
11201bbf7f
avformat/mov: reindent after previous commit
2015-01-02 11:38:28 +01:00
Clément Bœsch
55faf56c72
avformat/mov: move edit list heuristics into mov_build_index()
...
mov_read_elst() is now only responsible from storing the table in a data
structure; this is consistent with other table readers functions.
2015-01-02 11:38:21 +01:00
Michael Niedermayer
75cc57f73f
avcodec/mpeg12dec: Check actual aspect ratio instead of aspect_ratio_info
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 03:22:51 +01:00
Michael Niedermayer
1010b36d86
avcodec/mpeg12dec: Recalculate SAR unconditionally
...
Fixes Ticket4161
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 03:22:51 +01:00
Michael Niedermayer
aeb36fd207
avcodec/mpeg12dec: Move user data debug code out of unrelated if (buf_size > 29)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 03:22:51 +01:00
Clément Bœsch
6a29499b95
avformat/flvdec: remove duplicated line error
...
Fix typo regression since 5c37ffca59
Found-By: cousin_luigi
2015-01-01 22:09:21 +01:00
Michael Niedermayer
8009a51f7b
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: dump format before selecting streams
ffplay: add support for stream specifiers in -ast, -vst, -sst options
ffplay: remove unused no_background from videostate
ffplay: remove flushed state from decoder context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 20:19:56 +01:00
Michael Niedermayer
efc4bfc195
avformat/flvdec: use named identifier instead of literal numbers as return values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 20:19:09 +01:00
Michael Niedermayer
eb767a276b
avformat/flvdec: Increase string array size
...
Fixes parsing httphostheader of Scarlatti\,\ Pieter-Jan\ Belder\ -\ Sonata\ K113\ in\ A\ major\ -\ Alle.flv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 18:16:04 +01:00
Michael Niedermayer
322f0f5960
avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed into a new data stream
...
Such data streams (which then contain no other packets except the faulty one)
confuse some user applications, like VLC
Works around vlcticket 12389
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 18:13:22 +01:00
Michael Niedermayer
5c37ffca59
avformat/flvdec: add several error messages to error conditions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 18:03:54 +01:00
Marton Balint
46aa75eea1
ffplay: dump format before selecting streams
...
This helps the user to see the available streams just before the error message
if the stream specifiers do not match.
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-01-01 14:38:12 +01:00
Marton Balint
5e7dcb0491
ffplay: add support for stream specifiers in -ast, -vst, -sst options
...
Also fix the outdated documentation of these options.
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-01-01 14:38:12 +01:00
Marton Balint
82928656b1
ffplay: remove unused no_background from videostate
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-01-01 14:38:12 +01:00
Marton Balint
8c1f5fb0ae
ffplay: remove flushed state from decoder context
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-01-01 14:38:11 +01:00
Michael Niedermayer
d25d929600
avfilter/vf_idet: Add 9, 12 and 14 bit pixel formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 05:56:53 +01:00
Michael Niedermayer
18802bc81c
avfilter/vf_idet: Use frame_requested instead of prev
...
This is more robust if the delay is not constant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 02:30:16 +01:00
Michael Niedermayer
3eb5cbe0c5
avformat/cdxl: Fix integer overflow of image_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31 22:33:51 +01:00
James Almer
975ff6a3c6
x86/swr: disable pack_8ch functions on msvc/icl x86_32
...
Until a proper fix is committed.
Signed-off-by: James Almer <jamrial@gmail.com>
2014-12-31 16:38:33 -03:00
James Almer
5f14f9e984
x86/swr: add missing alignment check to pack_6ch functions
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-12-31 13:35:11 -03:00
Michael Niedermayer
5ba62e89df
avcodec/loco: check the init_get_bits8() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31 15:42:17 +01:00
Michael Niedermayer
131a185826
avcodec/loco: use enum for mode variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31 15:42:17 +01:00
Michael Niedermayer
037b527d62
doc/filters: document bit-depth independent cropdetect limit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31 04:49:48 +01:00
Michael Niedermayer
d97b94f1af
avcodec/loco: Support LOCO reference encoder with odd width
...
Fixes Ticket1221
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31 04:49:48 +01:00
James Almer
37b35feb64
x86/swr: add SSE2/AVX pack_8ch functions
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-12-30 23:05:27 -03:00
Michael Niedermayer
a288d08d84
avfilter/vf_cropdetect: adjust Default threshold based on bit depth
...
Also allow specifying thresholds that are bit depth independant
Previous version reviewed by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31 00:33:33 +01:00
Michael Niedermayer
081567397e
avfilter/vf_yadif: add >8bit planar rgb formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 22:52:45 +01:00
Michael Niedermayer
eee9b7a673
ffprobe: Support extracting the number of reference frames
...
Fixes Ticket3141
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 17:55:20 +01:00
Michael Niedermayer
eb465b8c56
avfilter/vf_uspp: clear AVPacket to not leave uninitialized memory
...
Fixes CID1260707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 15:15:36 +01:00
Clément Bœsch
0c10cf6ab1
fate: add a fate-filter-framepack rule
2014-12-30 14:28:54 +01:00
Clément Bœsch
39e18b1f40
avfilter/framepack: use FF_CEIL_RSHIFT()
2014-12-30 14:25:41 +01:00
Michael Niedermayer
e405a8a73e
avfilter/vf_cropdetect: extend limit to cover 16bit pixel formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 05:33:43 +01:00
Michael Niedermayer
a2e2a9f240
avfilter/vf_cropdetect: fix ; typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 05:32:14 +01:00
Michael Niedermayer
6ab4812f31
avfilter/vf_cropdetect: support 9-16bit planar formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 05:31:24 +01:00
Michael Niedermayer
5c7227bbb3
avfilter/vf_cropdetect: Unroll 3 & 4 bytes per sample loop
...
19484 -> 10266 decicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 02:39:36 +01:00
Michael Niedermayer
60e2c3110a
avfilter/vf_cropdetect: Unroll 1byte per sample loop
...
12807 -> 6336 decicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 02:32:00 +01:00
Michael Niedermayer
17dc83ab5e
avfilter/vf_cropdetect: add RGB & RGBA support
...
These where already supported in the code but not listed in the supported
pixel formats.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 02:19:05 +01:00
Michael Niedermayer
0ffb61e8ca
Merge commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7'
...
* commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7':
dashenc: Remove some stray double spaces
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 01:57:21 +01:00
Michael Niedermayer
e5a3766767
Merge commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b'
...
* commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b':
dashenc: Fix writing of timelines that don't start at t=0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 01:50:53 +01:00
Michael Niedermayer
8d3133f468
Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'
...
* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6':
fate: Use bitexact conversions in the dpxparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 01:44:08 +01:00
Carl Eugen Hoyos
7905bd5555
Fix decoding for little endian Aja Kona 10-bit RGB.
...
The little endian fourcc is r10k, big endian uses R10k.
Reported and analyzed by Jason Freets, jasonslife hotmail
2014-12-29 22:49:08 +01:00