Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / h264_cavlc.c

diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index f9daeb29d9ff1d22bf8f4c2922d4d2aa2985203f..a782f146986968f7901382d2a7d0132cd682628c 100644 (file)
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -1169,4 +1169,3 @@ decode_intra_mb:
 
     return 0;
 }
-