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 |
|
Stefano Sabatini
|
7e17389c1e
|
lavd/sdl: use verb in options help message
An help message tells what an option does, not what its argument is.
|
2012-07-19 23:56:59 +02:00 |
|
Nicolas George
|
4adf5dfadb
|
sdl: fix aspect ratio computations.
The rounding was wrong due to incorrect ue of floats,
changed to rationals and av_rescale.
The results were not properly passed to SDL.
|
2012-06-10 09:57:50 +02:00 |
|
Nicolas George
|
3ff6b1a2b3
|
sdl: fix overlay size.
The size passed to SDL_CreateYUVOverlay is the size
of the video in pixels, it must not take the aspect ratio
into account.
|
2012-06-10 09:42:31 +02:00 |
|
Nicolas George
|
2f9907be3e
|
sdl: add AVFMT_VARIABLE_FPS and AVFMT_NOTIMESTAMPS.
It allows vsync to be automatically set to passthrough.
|
2012-06-10 09:42:31 +02:00 |
|
Nicolas George
|
0ef4924db4
|
sdl: use AV_OPT_TYPE_IMAGE_SIZE.
|
2012-05-20 18:24:20 +02:00 |
|
Reimar Döffinger
|
91e7e6b721
|
Make sdl_overlay_pix_fmt_map static const.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
2011-11-05 15:37:02 +01:00 |
|
Clément Bœsch
|
539399d4d1
|
AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.
|
2011-10-17 07:33:10 +02:00 |
|
Stefano Sabatini
|
e844abc498
|
sdl: align option fields after last commit
|
2011-06-05 13:55:02 +02:00 |
|
Stefano Sabatini
|
0d0fdb0ad5
|
sdl: use the filename for defining the window title, if not specified
This allows a more efficient use of the commandline.
|
2011-06-05 13:17:38 +02:00 |
|
Stefano Sabatini
|
b2a6f25c67
|
lavdev: add SDL output device
|
2011-05-28 19:17:14 +02:00 |
|