summaryrefslogtreecommitdiff
path: root/ffplay.c
Commit message (Collapse)AuthorAge
* Do not crash if SDL_SetVideoMode() fails.Carl Eugen Hoyos2011-06-16
|
* Move do_exit() and stream_close() up.Carl Eugen Hoyos2011-06-16
|
* avfiltergraph: make the AVFilterInOut alloc/free API publicStefano Sabatini2011-06-12
| | | | | This is required for letting applications to create and destroy AVFilterInOut structs in a convenient way.
* avfiltergraph: change the syntax of avfilter_graph_parse()Stefano Sabatini2011-06-12
| | | | | | | Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Remove some non-compiling debug messages. ffplay: Fix non-compiling debug printf and replace it by av_dlog. H264: x86 predict init cosmetics. ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. Move E-AC-3 encoder functions to a separate eac3enc.c file. ac3enc: remove convenience macro, #define DEBUG ac3enc: remove unused #define vc1: re-initialize tables after width/height change. APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition samplefmt: add av_get_bytes_per_sample() iirfilter: fix biquad filter coefficients. swscale: remove duplicate conversion routine in swScale(). swscale: add yuv2planar/packed function typedefs. swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. swscale: reindent x86 init code. swscale: extract SWS_FULL_CHR_H_INT conditional into init code. swscale: cosmetics. swscale: remove alp/chr/lumSrcOffset. swscale: un-special-case yuv2yuvX16_c(). shorten: Remove stray DEBUG #define and corresponding av_dlog statement. ... Conflicts: doc/APIchanges libavcodec/ac3enc.c libavutil/avutil.h libavutil/samplefmt.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffplay: Fix non-compiling debug printf and replace it by av_dlog.Diego Biurrun2011-06-08
| |
| * Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG.Diego Biurrun2011-06-07
| |
| * cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-28
| | | | | | | | | | | | | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | ffplay: remove -debug optionStefano Sabatini2011-06-08
| | | | | | | | | | The options -loglevel LEVEL -debug FLAGS can be used for achieving the same objectives, with a finer level of control.
* | ffplay: remove -vismv optionStefano Sabatini2011-06-08
| | | | | | | | Use -vismv 1 instead. Simplify.
* | ffplay: Fix -vismvMichael Niedermayer2011-06-07
| | | | | | | | | | | | Fixes Ticket164 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: remove unnecessary OPT_DUMMY implementationStefano Sabatini2011-06-05
| | | | | | | | | | | | The -i INPUT option can be implemented more cleanly by using a function option, which can easily be done now that the parse_arg_function passed to parse_options has a standard signature.
* | cmdutils: change the signature of the function argument in parse_options()Stefano Sabatini2011-06-05
| | | | | | | | This is required for a pending simplification.
* | ffplay: error out with invalid sample rate or channels.Michael Niedermayer2011-06-04
| | | | | | | | | | Fixes Ticket119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: move "#undef main" from ffplay.c to cmdutils.hCarl Eugen Hoyos2011-06-03
| | | | | | | | | | | | | | | | | | | | | | On Windows/MinGW the SDL cflags re-define the main() function, which results in a linking error if the define is not undeffed. Since the addition of the SDL output device, SDL cflags are used also for compiling ffmpeg and ffprobe, so we need to move this trick from ffplay.c to a common header. Fix trac issue #256.
* | Fix various uninitialized variable warningsClément Bœsch2011-06-02
| |
* | Fix various unused variable warningsClément Bœsch2011-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-28
| | | | | | | | | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) ARM: add ARMv6 optimised av_clip_uintp2 ARM: remove volatile from asm statements in libavutil/intmath ARM: fix av_clipl_int32_arm() v4l: include avdevice.h ffserver: move close_connection() call to avoid a temporary string and copy. lavf: initialize demuxer private options. AVOptions: set string default values. lavdevice: mark v4l for removal on next major bump. swscale: fix compile on ppc. swscale: fix compile on x86-32. build: Remove generated .version file on distclean. configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2. doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected. ffplay: Remove disabled code. Mark parameterless function declarations as 'void'. swscale: use av_clip_uint8() in yuv2yuv1_c(). swscale: remove VOF/VOFW. swscale: split chroma buffers into separate U/V planes. swscale: replace formatConvBuffer[VOF] by allocated array. rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffplay: Remove disabled code.Diego Biurrun2011-05-26
| |
| * Add support for request_sample_format in ffmpeg and ffplay.Justin Ruggles2011-05-18
| |
| * ffplay: remove audio_write_get_buf_size() forward declarationStefano Sabatini2011-05-16
| | | | | | | | | | | | Move up the definition of audio_write_get_buf_size(), so that it is defined before it is used. Simplify. (cherry picked from commit 8776f3d22e401e30d17856e341f6cabbbefa92f7)
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (33 commits) rtpdec_qdm2: Don't try to parse data packet if no configuration is received ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand. ac3enc: clean up count_frame_bits() and count_frame_bits_fixed() mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame. srtdec: make sure we don't write past the end of buffer wmaenc: improve channel count and bitrate error handling in encode_init() matroskaenc: make sure we don't produce invalid file with no codec ID matroskadec: check that pointers were initialized before accessing them lavf: fix function name in compute_pkt_fields2 av_dlog message lavf: fix av_find_best_stream when providing a wanted stream. lavf: fix av_find_best_stream when decoder_ret is given and using a related stream. ffmpeg: factorize quality calculation tiff: add support for SamplesPerPixel tag in tiff_decode_tag() tiff: Prefer enum TiffCompr over int for TiffContext.compr. mov: Support edit list atom version 1. configure: Enable libpostproc automatically if GPL code is enabled. Cosmetics: fix prototypes in oggdec oggdec: fix memleak with continuous streams. matroskaenc: add missing new line in av_log() call dnxhdenc: add AVClass in private context. ... swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code. Above code is also just in case its not obvios to a large extended duplicates that where cherry picked from ffmpeg. Conflicts: configure ffmpeg.c libavformat/matroskaenc.c libavutil/pixfmt.h libswscale/ppc/swscale_template.c libswscale/swscale.c libswscale/swscale_template.c libswscale/utils.c libswscale/x86/swscale_template.c tests/fate/h264.mak tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_copy_le tests/ref/lavfi/pixfmts_null_le tests/ref/lavfi/pixfmts_scale_le tests/ref/lavfi/pixfmts_vflip_le Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS.Diego Biurrun2011-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems since it causes certain system functions to be hidden on some (BSD) systems. The solution is to only add the flag on systems that really require it, i.e. glibc-based ones. This change makes BSD systems compile out-of-the-box without the need for adding specific flags manually. It also allows dropping a number of flags set manually on a file-per-file basis, but were only present to work around breakage introduced by the presence of _POSIX_C_SOURCE. Also add _XOPEN_SOURCE to CPPFLAGS for glibc systems. We use XSI extensions in several places already, so it is preferable to define it globally instead of littering source files with individual #defines only needed for glibc.
| * ffplay: add a dummy option -i so that it is easy to switch between ffmpeg -i ↵Benjamin Larsson2011-05-11
| | | | | | | | | | | | "file" and ffplay -i "file". Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Add the notion of pixel size in h264 related functions.Oskar Arvidsson2011-05-10
| | | | | | | | | | | | | | | | | | | | In high bit depth the pixels will not be stored in uint8_t like in the normal case, but in uint16_t. The pixel size is thus 1 in normal bit depth and 2 in high bit depth. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().Stefano Sabatini2011-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace some commented-out debug printf() / av_log() messages with av_dlog().Diego Biurrun2011-04-29
| |
* | ffplay: fix null pointer read when codec unavilable.Michael Niedermayer2011-05-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()Stefano Sabatini2011-05-07
| | | | | | | | | | | | | | | | avfilter_copy_frame_props() avoids code duplication and increases robustness. The added files libavfilter/avcodec.[ch] are used for containing utilities useful for gluing togheter libavfilter and libavcodec.
* | ffplay: set CODEC_FLAG_EMU_EDGE earlierMichael Niedermayer2011-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix memleak if avfilter is disabledalexandru_mg32011-05-05
| |
* | ffplay: removed unused variable channels.Michael Niedermayer2011-05-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace deprecated av_get_pict_type_char() with av_get_picture_type_char()Stefano Sabatini2011-05-02
| |
* | ffplay: demuxer specific options supportMichael Niedermayer2011-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratioStefano Sabatini2011-05-01
| | | | | | | | | | | | | | | | | | Improve consistency with libavcodec. This breaks libavfilter API/ABI. The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously done with the lavfi minor number.
* | lavc: add a sample_aspect_ratio field to AVFrameStefano Sabatini2011-05-01
| | | | | | | | | | | | | | The sample aspect ratio is a per-frame property, so it makes sense to define it in AVFrame rather than in the codec/stream context. Simplify application-level sample aspect ratio information extraction, and allow further simplifications.
* | lavc: add a pkt_pos field to AVFrameStefano Sabatini2011-05-01
| | | | | | | | | | | | This is similar to what was done with pkt_pts. This simplifies the operation of extracting the pos information from the AVPacket, and allows further simplifications.
* | ffplay: move output_picture() code to queue_picture()Stefano Sabatini2011-04-27
| | | | | | | | | | Move output_picture() code to queue_picture(), and remove it. Simplify code path.
* | ffplay: rename video_refresh_timer() to video_refresh()Stefano Sabatini2011-04-27
| | | | | | | | The new name is shorter and less confusing.
* | ffplay: rename decode_thread to read_thread, parse_tid to read_tidStefano Sabatini2011-04-27
| | | | | | | | The new names are less misleading and more reciprocally consistent.
* | ffplay: fix logic for selecting the show mode in case of missing videoStefano Sabatini2011-04-25
| | | | | | | | | | | | | | | | | | Also automatically select the show mode only if not specified by the user. Fix trac issue #109. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: name ShowMode enumStefano Sabatini2011-04-25
| | | | | | | | | | | | Help debugging with GDB, maybe cleaner/safer. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlayStefano Sabatini2011-04-24
| | | | | | | | | | | | | | | | | | In video_image_display(), fix exception occurring when the size of the rectangle passed to SDL_DisplayYUVOverlay() is 0x0, which happens when interactively resizing the SDL window. This is done by forcing the minimum size to 1x1. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Lowercase all ff* program names.Diego Biurrun2011-04-23
| |
* | ffplay: factorize code calling output_packet() in video_thread()Stefano Sabatini2011-04-23
| | | | | | | | | | | | Slightly simplify. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: remove reference to unused QETimer symbolStefano Sabatini2011-04-23
| | | | | | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: rename stream_pause() to stream_toggle_pause()Stefano Sabatini2011-04-23
| | | | | | | | | | | | | | The new name is less misleading, since the function will resume the stream if it is currently paused. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>