On Mon, 25 Mar 2013, Diego Biurrun wrote:
On Mon, Mar 25, 2013 at 12:46:58PM +0200, Martin Storsjö wrote:
--- a/configure
+++ b/configure
@@ -1091,6 +1091,7 @@ CONFIG_LIST="
$PROGRAM_LIST
dct
doc
+ error_resilience
fft
gpl
gray
@@ -1349,7 +1350,6 @@ CONFIG_EXTRA="
aandcttables
ac3dsp
audio_frame_queue
- error_resilience
gcrypt
golomb
gplv3
Missing --help output update.
@@ -1691,7 +1692,7 @@ wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
# parsers
-h264_parser_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel
mpegvideo"
+h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo"
mpeg4video_parser_select="error_resilience mpegvideo"
mpegvideo_parser_select="error_resilience mpegvideo"
vc1_parser_select="mpegvideo"
This looks suspicious. You're not changing the H.264 parser itself;
was this a transitive dependency?
It depends on how you see it I guess. The dependency was in h264.c, which
both the h264 decoder and parser use. I'd rather not make the h264 parser
depend on the decoder though.
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1768,7 +1770,9 @@ static int h264_frame_start(H264Context *h)
- ff_er_frame_start(&h->er);
+ if (CONFIG_ERROR_RESILIENCE) {
+ ff_er_frame_start(&h->er);
+ }
pointless {}
Removed locally
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
