summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix an infinite loop when RoQ encoded generated a frame with a size greater ↵Vitor Sessak2011-03-22
| | | | | | | | | | | | than the maximum valid size. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Add kbdwin.o to AC3 decoderKieran Kunhya2011-03-22
| | | | | | | | | | | | Fixes --disable-everything --enable-decoder=ac3 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Detect byte-swapped AC-3 and support decoding it directly.Reimar Döffinger2011-03-22
| | | | | | | | | | | | | | This allows the AC-3 decoder to be used directly with RealMedia decoders that unlike the libavformat one do not byte-swap automatically. Since the new code is only used in case we would fail directly otherwise there should be no risk for regressions.
| * cosmetics: indentationJustin Ruggles2011-03-22
| |
| * Always copy input data for AC3 decoder.Justin Ruggles2011-03-22
| | | | | | | | | | | | | | Depending on error_recognition is not correct, low values do certainly not mean it is ok to crash. Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| * ac3enc: make sym_quant() branch-freeJustin Ruggles2011-03-22
| |
| * cosmetics: indentationJustin Ruggles2011-03-22
| |
| * Add a CPU flag for the Atom processor.Justin Ruggles2011-03-22
| | | | | | | | | | | | | | The Atom has SSSE3 support, which is useful in many cases, but sometimes the SSSE3 version is slower than the SSE2 equivalent on the Atom, but is generally faster on other processors supporting SSSE3. This flag allows for selectively disabling certain SSSE3 functions on the Atom.
| * id3v2: skip broken tags with invalid sizeAnton Khirnov2011-03-22
| | | | | | | | fixes issue2649.
| * id3v2: don't explicitly skip paddingAnton Khirnov2011-03-22
| | | | | | | | It's pointless, since there's a seek to the end of tag later.
| * Make sure kbhit() is in conio.hDave Yeo2011-03-22
| | | | | | | | | | | | | | | | Conio.h is a non-standard header and may not have kbhit() prototyped. This fixes compile on OS/2 where the EMX version (we're using a fork) of conio.h only has getch() and getche(). Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: update wmv8-drm referenceMans Rullgard2011-03-22
| | | | | | | | | | | | This updates the wmv8-drm reference after c47d383. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vc1: make P-frame deblock filter bit-exact.Ronald S. Bultje2011-03-21
| |
| * configure: Add the -D parameter to the dlltool commandMartin Storsjö2011-03-21
| | | | | | | | | | | | | | This is required for the generated .lib file to actually be usable by MSVC. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * amr: Set the AVFMT_GENERIC_INDEX flagMartin Storsjö2011-03-21
| | | | | | | | | | This makes the amr demuxer support seeking, closing roundup issue 2593.
| * amr: Set the pkt->pos field properly to the start of the packetMartin Storsjö2011-03-21
| | | | | | | | | | Previously, the field pointed to the second byte of the packet (which is the first byte of the actual AMR payload).
| * amr: Set the codec->bit_rate field based on the last packetMartin Storsjö2011-03-21
| | | | | | | | | | | | | | | | This allows libavformat to guess an estimated duration for amr files. For streams with varying bit rates (or with silence descriptors or "no frame" blocks) the guess is, of course, inaccurate.
| * rtsp: Specify unicast for TCP interleaved streams, tooMartin Storsjö2011-03-21
| | | | | | | | | | | | | | | | | | | | According to the RFC, the default is multicast if nothing is specified, which doesn't make sense for TCP. According to a bug report, some Axis camera models give a "400 Bad Request" error if this is omitted. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Set the correct target for mingw64 dlltoolLuca Barbato2011-03-21
| | | | | | | | That fixes .lib creation for the win64 target.
| * applehttp: Change the variable for stream position in seconds into int64_tMartin Storsjö2011-03-21
| | | | | | | | | | | | | | | | A similar variable for the total stream duration was changed to int64_t in b79c3df08807c96a945, due to overflows in some odd streams. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * 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>
| * id3v2: simplify error handling.Anton Khirnov2011-03-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * id3v2: explicitly seek to the end of the tag after readingAnton Khirnov2011-03-21
| | | | | | | | | | | | | | | | Current code might stop in the middle of an invalid tag. fixes issue2650 Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: make av_url_read_fseek/fpause internal.Anton Khirnov2011-03-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * vc1: slice support.Ronald S. Bultje2011-03-21
| | | | | | | | Also reset coded_block at each new slice, fixes problems in slice playback.
| * vc1: fix up memleaks in the error codepath.Ronald S. Bultje2011-03-21
| | | | | | | | | | Introduce end: and err: labels at the end of vc1_decode_frame(), which will clean up allocated memory consistently.
| * vc1: warn for unimplemented pan-scan feature.Ronald S. Bultje2011-03-21
| |
| * avio: deprecate url_filenoAnton Khirnov2011-03-20
| | | | | | | | | | | | | | | | It's an evil hack that assumes an AVIOContext is always based on top of an URLContext. It's also not used anywhere. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * rmenc: replace avio_seek(0) with avio_tell()Anton Khirnov2011-03-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: replace some more avio_seek(SEEK_CUR) with avio_skipAnton Khirnov2011-03-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * ffv1: allocate correct size for sample bufferMans Rullgard2011-03-20
| | | | | | | | | | | | | | This fixes a typo in the size calculation for the sample buffer introduced in cbabccc367424. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do no modify terminal parameters using termios.hPanagiotis H.M. Issaris2011-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove usage of tcgetattr and tcsetattr to modify terminal parameters, and rely on ctrl-c to stop instead of pressing 'q'. On systems with conio.h, keep the old behavior. Changing the terminal settings causes problems if multiple instances are running asynchronously on the same terminal, such as during a parallel FATE run, or if the process crashes before restoring the terminal. In both cases, the terminal state is messed up requiring a manual reset. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move ff_dct_init_mmx declaration to dct.hMans Rullgard2011-03-20
| | | | | | | | | | | | This was missed in 0aded94. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Do not use format string "%0.3f" for RTSP Range field.Carl Eugen Hoyos2011-03-22
| | | | | | | | | | Fixes ticket 10. The format string was locale-depending.
* | Fake-Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer2011-03-22
| |
* | ffprobe: tweak error message in open_input_file()Stefano Sabatini2011-03-21
| | | | | | | | | | Replace "codec (id=%d)" with "codec with id %d", slightly more readable.
* | Remove unused pixel format (PIX_FMT_UNUSED) and swap PIX_FMT_BGR48LE and ↵Peter Ross2011-03-21
| | | | | | | | | | | | PIX_FMT_BGR48BE enum order Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add xd55 codec tag for XDCAM HD422 720p25 CBR files.Tomas Härdin2011-03-21
| |
* | Allow demuxing of APE files with metadata tags.Carl Eugen Hoyos2011-03-21
| | | | | | | | Fixes ticket 11.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-21
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: add details to the documentation for ffmpeg -mapMike Scheutzow2011-03-20
| | | | | | | | | | | | Patch by Mike Sheutzow with some additions and changes by Stefano. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * ffmpeg: modify help text for the map optionStefano Sabatini2011-03-20
| | | | | | | | | | | | | | | | | | | | Change "file:stream[:syncfile:syncstream]" to "file.stream[:syncfile.syncstream]", the latter syntax is more consistent with the stream identifier form printed by av_dump_format(), and more readable. Both syntaxes are currently accepted by the opt_map() code. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * dct: remove superflous #includeMans Rullgard2011-03-20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move dct and rdft definitions to separate filesMans Rullgard2011-03-20
| | | | | | | | | | | | | | This leaves fft.h with only the core FFT and MDCT definitions thus making it more managable. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move sine windows to a separate fileMans Rullgard2011-03-20
| | | | | | | | | | | | | | These windows do not really belong in fft/mdct files and were easily confused with the similarly named tables used by rdft. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move ff_kbd_window_init() to a separate fileMans Rullgard2011-03-19
| | | | | | | | | | | | | | This function is not tightly coupled to mdct, and it's in the way of making a fixed-point mdct implementation. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fft: remove inline wrappers for function pointersMans Rullgard2011-03-19
| | | | | | | | | | | | | | This removes the rather pointless wrappers (one not even inline) for calling the fft_calc and related function pointers. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | configure: use pkg-config helpersMans Rullgard2011-03-19
| | | | | | | | | | | | | | | | | | This makes existing pkg-config uses as well as the libsdl checks use the new pkg-config helper functions, which should be more robust against broken systems. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: improve pkg-config supportMans Rullgard2011-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds helper functions for checking packages with pkg-config and managing the associated flags. Note that pkg-config use is still discouraged due to widespread poor practices resulting in broken flags in many situations. A few badly designed packages require flags only obtainable using pkg-config, and these functions are intended for those cases. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 3f8040db3e13c3dbdf07c74d92ca34817a69f733) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>