summaryrefslogtreecommitdiff
path: root/libavformat/smjpegdec.c
Commit message (Collapse)AuthorAge
* Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'Michael Niedermayer2013-03-14
|\ | | | | | | | | | | | | | | | | | | * commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e': avformat: av_log_ask_for_sample() ---> avpriv_request_sample() Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-13
| |
* | Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'Michael Niedermayer2012-12-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Return proper error code after av_log_ask_for_sample()Diego Biurrun2012-12-23
| |
* | smjpegdec: set nb_frames for video streamPaul B Mahol2012-11-02
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | smjpegdec: use url_feof()Paul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * smjpeg: fix type of 'ret' variable in smjpeg_read_packet()Mans Rullgard2012-10-12
| | | | | | | | | | | | | | The 'ret' variable is used for negative error codes so it should be a signed type. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Replace Libav with FFmpeg in license headers for files created by mePaul B Mahol2012-06-29
|/ | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* smjpegdec: implement seekingPaul B Mahol2012-02-14
| | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* lavf: remove AVFormatParameters from AVFormatContext.read_header signatureAnton Khirnov2012-01-27
|
* avformat: split out common SMJPEG codePaul B Mahol2012-01-16
This is a preparation for adding SMJPEG muxer. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>