a9ddb62489
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
...
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:41:34 +01:00
1ecdf8912b
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
2013-03-13 20:42:21 +01:00
d69238e991
Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'
...
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
Return proper error code after av_log_ask_for_sample()
configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
oggdec: check memory allocation
Conflicts:
configure
libavcodec/pictordec.c
libavformat/anm.c
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 15:09:58 +01:00
f3298f1299
Return proper error code after av_log_ask_for_sample()
2012-12-23 18:56:56 +01:00
c39fb30816
smjpegdec: set nb_frames for video stream
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-02 16:32:51 +00:00
6571833d1a
smjpegdec: use url_feof()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-13 14:15:58 +00:00
18884f159b
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
...
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 15:42:49 +02:00
366484fff1
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
...
The 'ret' variable is used for negative error codes so it should
be a signed type.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-12 22:21:10 +01:00
8fbe11e623
Replace Libav with FFmpeg in license headers for files created by me
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-29 01:58:34 +00:00
1c77a5307f
smjpegdec: implement seeking
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-02-14 10:12:44 +01:00
6e9651d106
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
2012-01-27 10:51:57 +01:00
68b94f8bc3
avformat: split out common SMJPEG code
...
This is a preparation for adding SMJPEG muxer.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2012-01-16 11:29:55 +01:00
Michael Niedermayer
Diego Biurrun
Paul B Mahol
Mans Rullgard
Anton Khirnov