Michael Niedermayer
|
4667116c39
|
Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'
* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
h264: fix build when error resilience is disabled
Conflicts:
libavcodec/h264_picture.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-06-20 23:18:45 +02:00 |
|
Vittorio Giovara
|
ca1e36a8e4
|
h264: fix build when error resilience is disabled
|
2014-06-20 12:48:06 -04:00 |
|
Michael Niedermayer
|
43c57dbe14
|
Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
h264_picture: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-05-27 22:34:16 +02:00 |
|
Diego Biurrun
|
888dcd8675
|
h264_picture: Remove pointless dsputil.h #include
|
2014-05-27 03:12:17 -07:00 |
|
Michael Niedermayer
|
be656c362d
|
avcodec/h264_picture: Fix build without error resilience
Found-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-05-20 21:31:40 +02:00 |
|
Michael Niedermayer
|
7ef01a7878
|
avcodec/h264: mark recovery_cnt==0 frames as keyframes
Fixes Ticket3063
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-05-03 16:01:45 +02:00 |
|
Michael Niedermayer
|
ffd77f94a2
|
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Split h264 slice decoding from nal decoding
Conflicts:
libavcodec/Makefile
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-24 01:33:02 +01:00 |
|
Luca Barbato
|
f51d0f39c0
|
h264: Split h264 slice decoding from nal decoding
|
2014-03-23 22:41:12 +01:00 |
|