summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'Michael Niedermayer2014-08-10
|\ | | | | | | | | | | | | | | | | | | | | * commit '9325d88eba8038b3e2a4485e473a018410379e2d': lavc: remove obsolete and disabled avpriv functions Conflicts: libavcodec/dv_profile.c libavcodec/dv_profile.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove obsolete and disabled avpriv functionsAnton Khirnov2014-08-09
| |
* | Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | * commit '24c788f4878729a42150581d7ed7e9a11daf874d': Remove obsolete FF_API_REFERENCE_DTS cruft. Conflicts: libavformat/avformat.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_REFERENCE_DTS cruft.Anton Khirnov2014-08-09
| |
* | avcodec: disable FF_API_FAST_MALLOCMichael Niedermayer2014-08-10
| | | | | | | | | | | | | | | | It causes build failures in some cases and the functions are provided by libavutil so the wraper should not be needed anymore Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b': Remove obsolete FF_API_PROBE_MIME cruft. Conflicts: libavformat/avformat.h libavformat/format.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_PROBE_MIME cruft.Anton Khirnov2014-08-09
| |
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-08-10
|\ \ | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/avio: do not include bprint.h. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/avio: do not include bprint.h.Nicolas George2014-08-09
| | | | | | | | | | | | See f75786f and 04bc370.
* | | Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'Michael Niedermayer2014-08-10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '472f9ed312ec784f7c72876b77163f4741880d05': Remove obsolete FF_API_AVFRAME_COLORSPACE cruft. Conflicts: libavcodec/utils.c libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.Anton Khirnov2014-08-09
| | |
* | | bump libpostproc and libswresampleMichael Niedermayer2014-08-10
| | | | | | | | | | | | | | | | | | | | | this is needed / avoids some headaches as one of their dependancies (libavutil) was bumped Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swresample-test: make it independant of the internal SWR_CH_MAXMichael Niedermayer2014-08-10
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | libavfilter/af_amerge: Do not depend on SWR_CH_MAXMichael Niedermayer2014-08-10
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/af_pan: Do not use SWR_CH_MAXMichael Niedermayer2014-08-10
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/af_pan: check if the number of channels where sucessfully setMichael Niedermayer2014-08-10
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: do not use SWR_CH_MAXMichael Niedermayer2014-08-10
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/version: delay removial of FF_API_AUDIO_CONVERT/FF_API_AVCODEC_RESAMPLEMichael Niedermayer2014-08-10
| | | | | | | | | | | | | | | | | | | | | | | | Some applications still use this deprecated API Its not nice to remove it when its still in use and as long as it doesnt cause us any work to keep it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8': Bump major versions of all libraries. Conflicts: doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h libavutil/version.h libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Bump major versions of all libraries.Anton Khirnov2014-08-09
| | |
* | | avcodec/version: leave old audio APIMichael Niedermayer2014-08-10
| | | | | | | | | | | | | | | | | | If people prefer we can also drop it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/flacdec: fix handling of av_samples_fill_arrays() return valueMichael Niedermayer2014-08-10
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | drop LLS1, rename LLS2 to LLSMichael Niedermayer2014-08-09
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avutil: delay removial of FF_API_GET_CHANNEL_LAYOUT_COMPATMichael Niedermayer2014-08-09
| | | | | | | | | | | | | | | | | | avoids fate failure of join filter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | delay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and ↵Michael Niedermayer2014-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | FF_API_OLD_ENCODE_VIDEO This prevents a build failure when bumping. the uses could easily be updated / removed, if people prefer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec: remove deprecated use of FF_IDCT_XVIDMMXMichael Niedermayer2014-08-09
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | * commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e': Postpone API-incompatible changes until the next bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Postpone API-incompatible changes until the next bump.Anton Khirnov2014-08-09
| | |
* | | Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84': hevc_filter: avoid excessive calls to ff_hevc_get_ref_list() Conflicts: libavcodec/hevc_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()Anton Khirnov2014-08-09
| | | | | | | | | | | | | | | | | | | | | | | | 1) each of the loops run within a single CTB, so the relevant reference list is constant 2) when that CTB is, or lies on the same slice as, the current one, we can use a simple access instead of a relatively expensive call to ff_hevc_get_ref_list()
* | | Merge commit '52a2c17ec006282f388071a831dfb21288611253'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52a2c17ec006282f388071a831dfb21288611253': hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list() Conflicts: libavcodec/hevc_refs.c See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()Anton Khirnov2014-08-09
| | | | | | | | | | | | | | | It makes no sense and cannot happen in any place from which this function is called.
* | | Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4': hevc_filter: move some conditions out of loops Conflicts: libavcodec/hevc_filter.c This is possibly less readable than the variant used before. Thus please take a look and if people agree its worse, dont hesitate to revert. See: 83976e40e89655162e5394cf8915d9b6d89702d9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc_filter: move some conditions out of loopsAnton Khirnov2014-08-09
| | |
* | | Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70211539a39ca3854f8a9e97d51dc27caa079943': hevc: deobfuscate slice/tile boundary handling for DBF Conflicts: libavcodec/hevc.c libavcodec/hevc_filter.c See: a5c621aa852522c79146035b2db4b89d2e096d3c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc: deobfuscate slice/tile boundary handling for DBFAnton Khirnov2014-08-09
| | | | | | | | | | | | | | | Use named constants instead of magic numbers, avoid using variables with inverse meaning from what their name implies.
* | | Merge commit '55019715785790836f60870180e1764b06e6591c'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55019715785790836f60870180e1764b06e6591c': hevc_filter: drop more redundant checks Conflicts: libavcodec/hevc_filter.c No change, as the removed checks where not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc_filter: drop more redundant checksAnton Khirnov2014-08-09
| | | | | | | | | | | | The if() around those loops ensures this condition is always false.
* | | Merge commit '65b8b6c476454d201348737527a1d9471f689278'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '65b8b6c476454d201348737527a1d9471f689278': hevc_filter: drop redundant checks Conflicts: libavcodec/hevc_filter.c No change as the removed checks where not in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc_filter: drop redundant checksAnton Khirnov2014-08-09
| | | | | | | | | | | | | | | ff_hevc_deblocking_boundary_strengths() is never called if the deblocking filter is disabled for the slice.
* | | Merge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9': hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled Conflicts: libavcodec/hevc.c See: 83976e40e89655162e5394cf8915d9b6d89702d9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabledAnton Khirnov2014-08-09
| | |
* | | avfilter/dctdnoiz: remove a few indirections in idctsClément Bœsch2014-08-09
| |/ |/| | | | | No change in the generated asm.
* | avformat/avio: Fix "warning: struct AVBPrint declared inside parameter list"Michael Niedermayer2014-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avdct: add "xvid" alias AVOption and use FF_IDCT_XVIDMichael Niedermayer2014-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36': avcodec: Rename xvidmmx IDCT to xvid Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Rename xvidmmx IDCT to xvidDiego Biurrun2014-08-08
| | | | | | | | The Xvid IDCT is not MMX-specific.
* | avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculationMichael Niedermayer2014-08-09
| | | | | | | | | | | | | | | | | | Fixes assertion failure Fixes Ticket3822 as a side-effect this makes some mkv files a few bytes smaller Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: write reel_name metadata to tmcd atomMark Reid2014-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Autodetect jpeg-ls files.Carl Eugen Hoyos2014-08-08
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 14:23:55 +0000