Michael Niedermayer
|
a0fe1a25fa
|
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-02-14 21:07:40 +01:00 |
|
Diego Biurrun
|
daf8cf358a
|
avformat: Don't anonymously typedef structs
|
2015-02-14 10:13:47 -08:00 |
|
James Almer
|
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 |
|
Michael Niedermayer
|
16ddc58bd7
|
Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
PAF demuxer and decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h
See: 7de4a16508, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-28 04:32:05 +01:00 |
|
Paul B Mahol
|
70daeacd6e
|
PAF demuxer and decoder
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
|
2014-03-27 23:34:47 +01:00 |
|
Michael Niedermayer
|
f58cd2867a
|
avformat/paf: Fix integer overflow and out of array read
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-08-09 13:23:10 +02:00 |
|
Paul B Mahol
|
09a0392341
|
paf: set channel layout
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2012-11-13 13:25:19 +00:00 |
|
Michael Niedermayer
|
693097c355
|
paf: avoid C99 overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-10-14 04:01:41 +02:00 |
|
Michael Niedermayer
|
7a72695c05
|
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-08-07 22:45:46 +02:00 |
|
Paul B Mahol
|
d84dd35f8e
|
paf: fix audio packet duration
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2012-08-03 15:18:12 +00:00 |
|
Paul B Mahol
|
26fa84105b
|
paf: properly flag video packets
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2012-07-08 20:49:04 +00:00 |
|
Paul B Mahol
|
7de4a16508
|
PAF demuxer and decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2012-07-05 02:54:34 +00:00 |
|