summaryrefslogtreecommitdiff
path: root/libavcodec/h264_picture.c
Commit message (Collapse)AuthorAge
* Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'Michael Niedermayer2014-06-20
|\ | | | | | | | | | | | | | | | | | | * commit 'ca1e36a8e4cd416142487071dbca734567bdaddf': h264: fix build when error resilience is disabled Conflicts: libavcodec/h264_picture.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fix build when error resilience is disabledVittorio Giovara2014-06-20
| |
* | Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'Michael Niedermayer2014-05-27
|\| | | | | | | | | | | | | * commit '888dcd86755d37e55fd74166f6d38ad66d41db58': h264_picture: Remove pointless dsputil.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_picture: Remove pointless dsputil.h #includeDiego Biurrun2014-05-27
| |
* | avcodec/h264_picture: Fix build without error resilienceMichael Niedermayer2014-05-20
| | | | | | | | | | Found-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: mark recovery_cnt==0 frames as keyframesMichael Niedermayer2014-05-03
| | | | | | | | | | | | Fixes Ticket3063 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-24
|/ | | | | | | | | | | * 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-23