[FFmpeg-cvslog] Remove a tab, somehow it sneaked past the hooks in the merge war.

Michael Niedermayer git at videolan.org
Fri Mar 25 02:54:00 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 25 02:50:09 2011 +0100| [3eb9e571dc8ddfc9d1ae99c2ee75f607181819c7] | committer: Michael Niedermayer

Remove a tab, somehow it sneaked past the hooks in the merge war.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3eb9e571dc8ddfc9d1ae99c2ee75f607181819c7
---

 libavcodec/mpegvideo.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 10a488b..16f3985 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2246,7 +2246,7 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){
  * @param h is the normal height, this will be reduced automatically if needed for the last row
  */
 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
-	const int field_pic= s->picture_structure != PICT_FRAME;
+    const int field_pic= s->picture_structure != PICT_FRAME;
     if(field_pic){
         h <<= 1;
         y <<= 1;




More information about the ffmpeg-cvslog mailing list