summaryrefslogtreecommitdiff
path: root/ffplay.c
Commit message (Collapse)AuthorAge
* 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>
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-19
| |
* | ffplay: implement -showmode optionStefano Sabatini2011-04-13
| | | | | | | | The new option allows to select the starting show mode.
* | ffplay: use symbolic constant values for show_audioStefano Sabatini2011-04-13
| | | | | | | | | | Also rename VideoState->show_audio to show_mode. Improve readability.
* | ffplay: remove audio_write_get_buf_size() forward declarationStefano Sabatini2011-04-13
| | | | | | | | | | Move up the definition of audio_write_get_buf_size(), so that it is defined before it is used. Simplify.
* | ffplay: avoid unnecessary intermediary struct in queue_picture()Stefano Sabatini2011-04-13
| | | | | | | | | | | | | | | | When CONFIG_AVFILTER, use a AVFrame -> AVPicture cast rather than explicitely copy the image information from AVFrame to a new AVPicture. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: remove unused field VideoState.dtg_active_formatStefano Sabatini2011-04-13
| | | | | | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Fix compilation with --disable-avfilter.Carl Eugen Hoyos2011-04-13
| |
* | ffplay: fix weird brace placement in video_image_display()Stefano Sabatini2011-04-12
| | | | | | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: rename output_picture2() to output_picture()Stefano Sabatini2011-04-12
| | | | | | | | | | | | The "2" suffix is confusing. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: remove useless intermediary variable dst_pix_fmt in queue_picture()Stefano Sabatini2011-04-12
| | | | | | | | | | | | Simplify. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: avoid forward declaration for packet_queue_put()Stefano Sabatini2011-04-12
| | | | | | | | | | | | Define the function before it is used. Simplify. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffplay: compact expression in compute_mod()Stefano Sabatini2011-04-12
| | | | | | | | | | | | | | Prefer "return X ? Y : Z" over "if (x) return Y; else return Z", reduce line count. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Add the notion of pixel size in h264 related functions.Oskar Arvidsson2011-04-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: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: avio_ prefix for url_set_interrupt_cb.Anton Khirnov2011-04-07
| |
| * ffplay: Don't assume ic->pb is non-nullMartin Storsjö2011-03-21
| | | | | | | | | | | | | | | | | | This fixes crashes on exit when plaing some RealRTSP streams (among other), e.g. rtsp://dl.lib.brown.edu:554/areserves/1093545294660883.mp3. These crashes have been present since 3e68b3ba7b015cf21. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | ffplay: Set EMU_EDGE if dr1, this is an alternative fix for ticket40.Michael Niedermayer2011-04-08
| | | | | | | | | | Idea borrowed from mplayer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | move image check down in ffplay.cMichael Niedermayer2011-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Disable dr1 in ffplay for svq1 (fixes ticket40)Michael Niedermayer2011-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Check sizes a bit in ffplay, cant hurt.Michael Niedermayer2011-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: add braces around union definitionStefano Sabatini2011-03-19
| | | | | | | | | | | | | | Fix warning: ffplay.c: At top level: ffplay.c:3027: warning: missing braces around initializer ffplay.c:3027: warning: (near initialization for ‘options[53].u’)
* | ffplay: add existence check on ic->pb in decode_thread()Stefano Sabatini2011-03-19
| | | | | | | | | | Fix crash if ic->pb is NULL and ic->pb->error is evaluated. This happens for example with: ffplay photo.jpeg.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-15
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: deprecate url_ferrorAnton Khirnov2011-03-15
| | | | | | | | | | | | AVIOContext.error should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-07
| | | | | | | | | | | | AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-16
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Remove disabled legacy code in ffplay.Stefano Sabatini2011-02-14
| | | | | | | | | | | | | | | | | | | | | | | | The code was setting aspect ratio from the DTG active format, and was present and disabled since the creation of ffplay. See thread: Subject: [FFmpeg-devel] [PATCH] Cosmetics: adopt compact notation in disabled code. Date: Sat, 12 Feb 2011 18:46:19 +0100 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Deprecate avcodec_thread_init()Alexander Strange2011-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As a side effect of the last commit, avcodec_open() now calls it automatically, so there is no longer any need for clients to call it. Instead they should set AVCodecContext.thread_count. avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the next MAJOR libavcodec bump. Rename the functions to ff_thread_init/free, since they are now internal. Wrappers are provided to maintain API compatibility. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Frame-based multithreading framework using pthreadsAlexander Strange2011-02-09
| | | | | | | | | | | | See doc/multithreading.txt for details on use in codecs. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Adopt pkt_dts/pkt_pts in lavc clientsAlexander Strange2011-02-05
| | | | | | | | | | | | No behavior change; this makes DTS reliable with the next patch. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-04
| | | | | | | | | | | | | | | | | | | | Make avfilter_graph_free() free not only the internal structures, but also the allocated graph, and set the graph pointer to NULL for increased safety. Simplify usage. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ffplay: factorize code from video_thread() into configure_video_filters()Stefano Sabatini2011-02-02
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.Stefano Sabatini2011-01-30
| | | | | | | | | | | | AVCodecContext.reordered_opaque is deprecated for this specific use. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ffplay: in video_thread(), use av_dlog() for timestamp logging.Stefano Sabatini2011-01-30
| | | | | | | | | | | | | | Disable logging of rescaled timestamps if DEBUG is not enabled. Avoid debug log spamming with -loglevel debug. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove outdated and confusing comment.Stefano Sabatini2011-01-22
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | ffplay: Continue if the file was appended to.Michael Niedermayer2011-03-10
| | | | | | | | | | | | This is a bit experimental Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg ↵Benjamin Larsson2011-03-08
| | | | | | | | | | | | -i "file" and ffplay -i "file". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>