summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/h264: Use named identifier for single thread fall-back return from ↵Michael Niedermayer2014-06-191-1/+1
| | | | | | ff_h264_decode_slice_header() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: fix frame skip codeMichael Niedermayer2014-06-161-11/+5
| | | | | | Fixes Ticket3475 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: use the correct level for droping non intra framesMichael Niedermayer2014-06-161-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: in the absence of recovery points, be more tolerant on ↵Michael Niedermayer2014-06-041-0/+1
| | | | | | | accepting plain I frames Fixes: Ticket3652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: mark recovery_cnt==0 frames as keyframesMichael Niedermayer2014-05-031-0/+2
| | | | | | Fixes Ticket3063 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264/find_start_code: factorize addition outMichael Niedermayer2014-04-071-2/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'Michael Niedermayer2014-04-071-72/+131
|\ | | | | | | | | | | | | | | | | | | * commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a': h264: Refactor decode_nal_units Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Refactor decode_nal_unitsLuca Barbato2014-04-061-59/+122
| |
* | avcodec: Make ff_print_debug_info2() independant of Picture structMichael Niedermayer2014-03-271-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-241-2708/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: h264: Split h264 slice decoding from nal decoding Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Split h264 slice decoding from nal decodingLuca Barbato2014-03-231-2514/+21
| |
* | Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'Michael Niedermayer2014-03-241-784/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0': h264: move macroblock decoding into its own file Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move macroblock decoding into its own fileVittorio Giovara2014-03-231-785/+0
| |
* | avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra PredictionYogender Kumar Gupta2014-03-181-1/+6
| | | | | | | | | | | | This is limited to the case where x264_build = -1, to not break x264 decoding Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'Michael Niedermayer2014-03-171-1/+0
|\ \ | |/ | | | | | | | | | | * commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658': h264 does not depend on mpegvideo any more Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264 does not depend on mpegvideo any moreVittorio Giovara2014-03-161-1/+0
| |
* | Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-171-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara2014-03-161-0/+1
| |
* | Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'Michael Niedermayer2014-03-171-10/+3
|\ \ | |/ | | | | | | | | | | * commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d': h264: Remove MotionEstContext and move the relevant fields to H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Remove MotionEstContext and move the relevant fields to H264ContextVittorio Giovara2014-03-161-10/+3
| | | | | | | | Unused buffers scratchpad and temp have been dropped too.
* | Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'Michael Niedermayer2014-03-171-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c': h264: Replace mpegvideo-specific MAX_THREADS by private define Conflicts: libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Replace mpegvideo-specific MAX_THREADS by private defineVittorio Giovara2014-03-161-4/+4
| |
* | Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'Michael Niedermayer2014-03-171-11/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27': h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private defineVittorio Giovara2014-03-161-11/+11
| |
* | avcodec/h264: h264_set_erpic() clear destinationMichael Niedermayer2014-03-171-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'Michael Niedermayer2014-03-171-25/+46
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87': h264: move relevant fields from Picture to H264Picture Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move relevant fields from Picture to H264PictureVittorio Giovara2014-03-161-26/+47
| |
* | Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'Michael Niedermayer2014-03-171-6/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * er: move relevant fields from Picture to ERPictureVittorio Giovara2014-03-161-3/+5
| | | | | | | | | | | | | | This is done to disentangle ER from mpegvideo. In order to use a classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function to set the fields. Please note that buffers need to be allocated before calling ff_er_frame_end().
* | Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'Michael Niedermayer2014-03-171-5/+5
|\ \ | |/ | | | | | | | | | | * commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e': h264: directly use frames in ff_h264_draw_horiz_band() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: directly use frames in ff_h264_draw_horiz_band()Vittorio Giovara2014-03-161-5/+5
| |
* | avcodec/h264: be more tolerant on what pixel format changes trigger reinitsMichael Niedermayer2014-03-171-1/+12
| | | | | | | | | | | | Fixes Ticket3260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-281-10/+10
|\ \ | |/ | | | | | | | | | | * qatar/master: Give IDCT matrix transpose macro a more descriptive name Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give IDCT matrix transpose macro a more descriptive nameDiego Biurrun2014-02-271-10/+10
| | | | | | | | This also avoids a macro name clash and related warning on ARM.
| * h264: Fix a typo from the previous commitLuca Barbato2014-02-221-1/+1
| | | | | | | | | | | | f777504f640260337974848c7d5d7a3f064bbb45 changed a - in + CC: libav-stable@libav.org
* | avcodec/h264: allow mixing idr and non idr slices with frame threading againMichael Niedermayer2014-02-271-2/+4
| | | | | | | | | | | | | | This combination exists in the wild Fixes Ticket3131 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: fix droped frame handling also for threads > 1Michael Niedermayer2014-02-271-0/+2
| | | | | | | | | | | | | | Seems i mistakely tested just with threads=1 Fixes part of Ticket3386 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: avoid using lost frames as referencesMichael Niedermayer2014-02-271-0/+1
| | | | | | | | | | | | Fixes Ticket3386 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: clear chroma planes when flags gray is usedMichael Niedermayer2014-02-231-0/+12
| | | | | | | | | | Fixes Ticket3397 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: use subsample factors of the used pixel formatMichael Niedermayer2014-02-211-3/+4
| | | | | | | | | | | | | | Fixes out of array read Fixes: 1cb91c36c4e55463f14aacb9bdf55b38-asan_heap-oob_106cbce_5617_cov_11212800_h264_mmx_chroma_intra_lf.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: fix sign errorMichael Niedermayer2014-02-211-1/+1
| | | | | | | | | | | | regression since f777504f640260337974848c7d5d7a3f064bbb45 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-211-8/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: h264: Lower bound check for slice offsets Conflicts: libavcodec/h264.c See: 91253839e14cce9793ee93f184cef609ca8195d5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Lower bound check for slice offsetsVittorio Giovara2014-02-201-8/+10
| | | | | | | | | | | | | | | | | | | | And use the value from the specification. Sample-Id: 00000451-google Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-191-2/+6
|\ \ | |/ | | | | | | | | | | * qatar/master: h264: informative error reporting in decode_slice_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: informative error reporting in decode_slice_header()Luca Barbato2014-02-181-2/+6
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * h264: fix slice_type value reported in decode_slice_header()Luca Barbato2014-02-181-1/+1
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/h264: more completely check the loop filter parametersMichael Niedermayer2014-02-171-2/+2
| | | | | | | | | | | | | | Fixes out of array read Fixes: caa65cc01655505705129b677189f036-signal_sigsegv_fdcc43_2681_cov_3043376737_PPH422I5_Panasonic_A.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '15210354cf27cf4e24d91f84d66cf471511ce718'Michael Niedermayer2014-02-141-1/+1
|\ \ | |/ | | | | | | | | | | * commit '15210354cf27cf4e24d91f84d66cf471511ce718': h264: drop outdated comments Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: drop outdated commentsVittorio Giovara2014-02-141-1/+1
| |
* | Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'Michael Niedermayer2014-02-141-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '3a0576702825423abecb32627c530dbc4c0f73bc': h264: store current_sps_id inside the current sps Conflicts: libavcodec/h264.c libavcodec/h264_ps.c The current_sps_id is not removed as it used in security related code. Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status