d609566270
Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'
...
* commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a':
img2dec: check av_new_packet return value
Conflicts:
libavformat/img2dec.c
See: 3f8148911c
2014-10-25 03:37:21 +02:00
f1ed83e23a
img2dec: check av_new_packet return value
...
CC: libav-stable@libav.org
Bug-Id: CID 1087077
2014-10-24 23:42:53 +01:00
e079d43af8
avformat/img2dec: Attempt to detect non-escaped glob patterns too (-pattern_type glob)
...
Fixes ticket #3948
Based-on-patch-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 03:56:42 +02:00
684508ba15
avformat/img2dec: Support -loop with pipes
...
Fixes Ticket3976
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 01:49:25 +02:00
97cb9b6cbb
Revert "avformat/img2dec: reduce bmppipe probe score"
...
This seems not needed anymore
This reverts commit 321c3cd1a9
2014-10-03 14:15:02 +02:00
88c937fdc8
Autodetect jpg images.
...
Based on 2d3842f5#2541 .
2014-09-26 00:06:41 +02:00
ce6e46be72
avformat/img2dec: enable generic seeking for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 17:47:45 +02:00
6d35aba167
avformat/img2dec: initialize pkt->pos for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 17:16:14 +02:00
2497914a18
avformat/img2dec: pass error code and signal EOF
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 16:20:23 +02:00
1dbdcb4a8c
avformat/img2dec: fix error code at EOF for pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 15:22:42 +02:00
b3fd2b175c
avformat/img2dec: Fail probing when no data is yet available and the filename contains no number/glob patterns either.
...
Fixes Ticket3901
the seek test error codes change due to a change in the failure path,
this could be avoided by changing the respective error codes to EINVAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-12 19:01:44 +02:00
321c3cd1a9
avformat/img2dec: reduce bmppipe probe score
...
bmp pipe needs the bmp parser which is not bug free and should thus not be favored
over the bmp image2 demuxer
that also means this change could be reverted in case bmp pipe is improved so it
handles all single bmp images correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-12 18:19:11 +02:00
5303a644f5
avformat/img2: Make AVOptions available to img* demuxers defined in other files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 15:10:15 +02:00
2c0454cd20
Add missing initialization for AVProbeData.
...
This has become necessary since the new mime field was added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-11 21:10:22 +02:00
273fc0139e
lavf/img2dec: Initialize a stack variable.
...
Fixes a valgrind warning about using unitialised memory.
Hopefully fixes crashes on several platforms reported through fate.
2014-08-10 18:20:12 +02:00
4b63bcef90
Autodetect jpeg-ls files.
2014-08-08 22:43:15 +02:00
f73d75384f
Autodetect webp files.
2014-08-08 16:14:18 +02:00
d34ec64a22
replace calls to url_feof() with avio_feof()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 00:48:38 +02:00
050d79b6dd
Autodetect big-endian tiff files.
2014-07-22 18:09:14 +02:00
135ea609ce
libavformat/img2dec.c: Add a long_name to the piped image demuxers
...
This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 05:14:44 +02:00
d1a8659efe
avformat/img2dec: remove functions from image pipe which are unneeded for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04 16:44:40 +02:00
c277ab6b78
avformat/img2dec: improve bmp probe
...
fix probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04 04:54:52 +02:00
d36fe733c1
avformat/img2dec: increase probe buffer to 2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04 04:54:32 +02:00
0437445926
avformat/img2dec: set AVProbeData size correctly on corner cases of tiny files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04 04:00:27 +02:00
6691eee48c
avformat/img2dec: avoid seekback on probeing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04 04:00:27 +02:00
726e253b00
avformat/img2dec: allocate and clear padding area for probe correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04 04:00:27 +02:00
4c145b692c
Autodetect JPEG2000 imagess.
...
Autodetection of jp2 files does not work yet, the files are detected
as mov.
2014-07-04 02:10:26 +02:00
d538dd824e
avformat: Add image3 demuxers with format autodetection
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 18:14:06 +02:00
b465aaa59f
avformat/img2dec: fix typo
...
Found-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-14 21:40:59 +02:00
f683895dee
avformat/img2dec: support nanosecond file times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 04:52:01 +02:00
1f361124d9
avformat/img2dec: zero probe buffer
...
Fixes use of uninitialized memory
Fixes valgrind failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 23:47:29 +02:00
2cffdcbdd7
avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29 00:38:51 +01:00
1c13e1ef36
avformat/img2dec: Use avformat probing interface to identify format if it has not been otherwise identified
...
This is used only for distinguishing .pix formats for now.
Which is the only case that has image2 demuxers currently
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 23:54:51 +01:00
067a9cf81a
avformat/img2dec: make image2dec capable to be used from seperate demuxers
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 23:54:51 +01:00
2395ae22ce
img2dec: fix typo (double "with with")
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-12 18:04:09 +02:00
16f3102f41
avformat/img2dec: timestamps are 64bit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-05 14:41:16 +02:00
760a9754ca
img2dec: support seeking with ts_from_file
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 12:06:14 +02:00
a753776ff5
img2dec: dont set start_time/duration to invalid values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 12:05:32 +02:00
70fbfd75c3
img2dec: Add ts_from_file option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 11:42:28 +02:00
f083b4c338
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
...
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:31:03 +02:00
e0f8be6413
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
2013-05-04 21:43:06 +02:00
9a8f1e7295
img2dec: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:25 +00:00
1d5b4f9fe9
img2dec: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:25 +00:00
069d156454
lavf/img2dec: fix option help fields
2013-01-25 00:04:22 +01:00
05340be97b
img2dec: support seeking in infinitely looped stream
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21 19:53:41 +01:00
252316c885
img2dec: fix -loop
...
This fixes a infinite loop with -loop and -vframes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-08 20:07:16 +01:00
626756aed2
img2dec: do not change packet pts for image2pipe
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-08 16:51:18 +00:00
55d32eed8f
img2dec: seeking support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-08 14:29:22 +00:00
f83657fcf6
Add exception for "gif" in image2 probe() method.
...
Without this exception files with ".gif" extension by default
recognized as input suitable for image2 demuxer rather than gif.
In order to pass image through gif demuxer it was necessary
to use -f gif option.
This change affected 'make fate' test results because previously
image2 demuxer and gif decoder took only first frame of multiframe
test data, which is no longer true with gif demuxer.
Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
2012-11-30 14:35:11 +00:00
db29a7c7c2
Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'
...
* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
build: The FLAC encoder also depends on the flacdsp code
img2: K&R formatting cosmetics
h264: check context state before decoding slice data partitions
flashsv: make sure data for zlib priming is available
Conflicts:
libavcodec/Makefile
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-30 14:49:13 +01:00
Michael Niedermayer
Vittorio Giovara
Alexander Strasser
Carl Eugen Hoyos
Reimar Döffinger
James Almer
Andreas Cadhalpun
Kirill Gavrilov
Andrey Utkin
Diego Biurrun
Paul B Mahol
Stefano Sabatini
Vitaliy E Sugrobov