summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '8ac0f6767bf63d3e6b308ee6648ff02598b81e03'Michael Niedermayer2012-11-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ac0f6767bf63d3e6b308ee6648ff02598b81e03': dcadec: allow the decoder to change the channel layout mid-stream cook: use av_dlog() for debug logging instead of av_log() with AV_LOG_ERROR cook: move samples_per_frame from COOKSubpacket to where it is used cook: use av_get_channel_layout_nb_channels() instead of cook_count_channels() cook: reverse a condition so that the code makes more sense cook: remove unneeded COOKContext variable, sample_rate cook: remove unneeded COOKContext variable, bit_rate cook: use AVCodecContext.channels instead of keeping a private copy bmvaudio: set channel layout at init() rather than validating it atrac1: do not keep a copy of channel count in the private context dsicinaudio: set channels and channel layout g722dec: set channel layout at initialization instead of validating it amrwbdec: set channels, channel_layout, and sample_rate amrnbdec: set channels, channel_layout, and sample_rate dca_parser: allow the parser to change the sample rate lavc: check channel count after decoder init lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders Conflicts: libavcodec/dcadec.c libavcodec/pcm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: allow the decoder to change the channel layout mid-streamJustin Ruggles2012-11-01
| |
| * cook: use av_dlog() for debug logging instead of av_log() with AV_LOG_ERRORJustin Ruggles2012-11-01
| |
| * cook: move samples_per_frame from COOKSubpacket to where it is usedJustin Ruggles2012-11-01
| |
| * cook: use av_get_channel_layout_nb_channels() instead of cook_count_channels()Justin Ruggles2012-11-01
| |
| * cook: reverse a condition so that the code makes more senseJustin Ruggles2012-11-01
| |
| * cook: remove unneeded COOKContext variable, sample_rateJustin Ruggles2012-11-01
| |
| * cook: remove unneeded COOKContext variable, bit_rateJustin Ruggles2012-11-01
| |
| * cook: use AVCodecContext.channels instead of keeping a private copyJustin Ruggles2012-11-01
| |
| * bmvaudio: set channel layout at init() rather than validating itJustin Ruggles2012-11-01
| |
| * atrac1: do not keep a copy of channel count in the private contextJustin Ruggles2012-11-01
| |
| * dsicinaudio: set channels and channel layoutJustin Ruggles2012-11-01
| |
| * g722dec: set channel layout at initialization instead of validating itJustin Ruggles2012-11-01
| |
| * amrwbdec: set channels, channel_layout, and sample_rateJustin Ruggles2012-11-01
| | | | | | | | Only mono 16kHz is supported.
| * amrnbdec: set channels, channel_layout, and sample_rateJustin Ruggles2012-11-01
| | | | | | | | Only mono 8kHz is supported.
| * dca_parser: allow the parser to change the sample rateJustin Ruggles2012-11-01
| |
| * lavc: check channel count after decoder initJustin Ruggles2012-11-01
| | | | | | | | | | | | Ensures the decoder did not set channel count to an insanely high value during initialization, which could cause large memory usage when it tries to get a buffer during decoding.
| * lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decodersJustin Ruggles2012-11-01
| |
* | Add QT CC track mux supportJason2012-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dv1394: fix order of AVOption fieldsMichael Niedermayer2012-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Apply again [916352f282855e3e4e86a39df9452fead2aa0771] that got lost in the ↵Alexis Ballier2012-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | merges. Do not quote second argument to filter{,_out} in check_ld. We want to keep/remove all the space-separated words matching the -l* pattern, not keep everything if the whole argument begins with -l and remove it otherwise. This also fixes errors like: ./configure: eval: line 418: syntax error near unexpected token `-l*' ./configure: eval: line 418: `case in -l*) ;; *) echo ;; esac' when run with ./configure --enable-openal Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2012-11-01
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: remove redundant !codec check ffplay: only initialize codec opts before using it ffplay: always free buffersink_params in configure_video_filters ffplay: remove uneeded format filter, buffersink format is set ffplay: check for buffersink_params allocation success ffplay: always free inputs and outputs in configure_filtergraph ffplay: fill the unused part of the window with black ffplay: add update parameter to fill_rectangle Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: remove redundant !codec checkMarton Balint2012-11-01
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: only initialize codec opts before using itMarton Balint2012-11-01
| | | | | | | | | | | | | | | | | | Fixes Coverity CID 733793. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: always free buffersink_params in configure_video_filtersMarton Balint2012-11-01
| | | | | | | | | | | | | | | | | | Fixes Coverity CID 733792. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: remove uneeded format filter, buffersink format is setMarton Balint2012-11-01
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: check for buffersink_params allocation successMarton Balint2012-11-01
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: always free inputs and outputs in configure_filtergraphMarton Balint2012-11-01
| | | | | | | | | | | | | | | | | | Fixes Coverity CID 733791. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: fill the unused part of the window with blackMarton Balint2012-11-01
| | | | | | | | | | | | | | | | | | Should fix ticket #1667. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: add update parameter to fill_rectangleMarton Balint2012-11-01
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | | lavf: fix integer overflow in rfps calculationMichael Niedermayer2012-11-01
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avienc: force a valid timebase for videoMichael Niedermayer2012-11-01
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | doc/platform: Comply With All Capitalized Words ConventionStefano Sabatini2012-11-01
| | |
* | | lavfi/fifo: add assert to ensure request was successfull.Michael Niedermayer2012-11-01
| | | | | | | | | | | | | | | | | | We would crash a moment later anyway if this fails. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mpegts_probe: detect files with garbage at the begin.Michael Niedermayer2012-11-01
|/ / | | | | | | | | | | Fixes Ticket1811 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Fix inferred misuses of enumsTomas Härdin2012-11-01
| | | | | | | | | | | | This fixes CID 700457, 700458 and 703705. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo_probe: check slice orderMichael Niedermayer2012-11-01
| | | | | | | | | | | | Fixes: Enrique.mp3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV avconv_opt, cmdutils: Add missing function parameter Doxygen x86: Move optimization suffix to end of function names Conflicts: cmdutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONVJanne Grunau2012-10-31
| | | | | | | | Fixes typo in 2cbdd7c92958cb8226491d8eb23ed2d57d4b841e.
| * avconv_opt, cmdutils: Add missing function parameter DoxygenDiego Biurrun2012-10-31
| |
| * x86: Move optimization suffix to end of function namesDiego Biurrun2012-10-31
| | | | | | | | This simplifies cpuflags porting.
* | Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'Michael Niedermayer2012-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415': x86: h264_chromamc_10bit: drop pointless PAVG %define x86: mmx2 ---> mmxext in function names swscale: do not forget to swap data in formats with different endianness Conflicts: libavcodec/x86/dsputil_mmx.c libavfilter/x86/gradfun.c libswscale/input.c libswscale/utils.c libswscale/x86/swscale.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264_chromamc_10bit: drop pointless PAVG %defineDiego Biurrun2012-10-31
| | | | | | | | It is only used in one place so there is no need for the abstraction.
| * x86: mmx2 ---> mmxext in function namesDiego Biurrun2012-10-31
| |
| * swscale: do not forget to swap data in formats with different endiannessKostya Shishkov2012-10-31
| | | | | | | | | | | | | | | | Otherwise during scaling it will try to interpret input in the wrong way and that leads to the test results disagreeing on different platforms and with different optimizations. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | doc/filters: add "Notes on filtergraph escaping" sectionStefano Sabatini2012-11-01
| | | | | | | | | | Should help to clarify escaping issues in the filtergraph syntax. In particular, should address trac ticket #1813.
* | rational: test add/sub tooMichael Niedermayer2012-11-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: allow specifying the file for -reportMichael Niedermayer2012-11-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix typo in platform documentation.Carl Eugen Hoyos2012-11-01
| |
* | flicvideo: return more meaningful error codesPaul B Mahol2012-11-01
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>