[FFmpeg-cvslog] lavc/mediacodec: remove stray empty lines

Matthieu Bouron git at videolan.org
Tue Mar 15 10:36:35 CET 2016


ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Mon Mar 14 19:41:53 2016 +0100| [03a6ed83b029588c0927594b88f4cb0a254348c8] | committer: Matthieu Bouron

lavc/mediacodec: remove stray empty lines

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

 libavcodec/mediacodec_wrapper.c |    7 -------
 libavcodec/mediacodecdec.c      |    1 -
 2 files changed, 8 deletions(-)

diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
index 3f8db64..6b3f905 100644
--- a/libavcodec/mediacodec_wrapper.c
+++ b/libavcodec/mediacodec_wrapper.c
@@ -398,7 +398,6 @@ fail:
     return NULL;
 }
 
-
 int ff_AMediaFormat_delete(FFAMediaFormat* format)
 {
     int ret = 0;
@@ -658,7 +657,6 @@ fail:
     return ret;
 }
 
-
 void ff_AMediaFormat_setInt32(FFAMediaFormat* format, const char* name, int32_t value)
 {
     int attached = 0;
@@ -913,7 +911,6 @@ static const struct FFJniField jni_amediacodec_mapping[] = {
         { "android/media/MediaCodec", "getInputBuffer", "(I)Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecFields, get_input_buffer_id), 0 },
         { "android/media/MediaCodec", "getInputBuffers", "()[Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecFields, get_input_buffers_id), 1 },
 
-
         { "android/media/MediaCodec", "dequeueOutputBuffer", "(Landroid/media/MediaCodec$BufferInfo;J)I", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecFields, dequeue_output_buffer_id), 1 },
         { "android/media/MediaCodec", "getOutputBuffer", "(I)Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecFields, get_output_buffer_id), 0 },
         { "android/media/MediaCodec", "getOutputBuffers", "()[Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecFields, get_output_buffers_id), 1 },
@@ -931,7 +928,6 @@ static const struct FFJniField jni_amediacodec_mapping[] = {
     { NULL }
 };
 
-
 static const AVClass amediacodec_class = {
     .class_name = "amediacodec",
     .item_name  = av_default_item_name,
@@ -1252,7 +1248,6 @@ fail:
     return NULL;
 }
 
-
 int ff_AMediaCodec_delete(FFAMediaCodec* codec)
 {
     int ret = 0;
@@ -1388,7 +1383,6 @@ fail:
     return ret;
 }
 
-
 int ff_AMediaCodec_releaseOutputBuffer(FFAMediaCodec* codec, size_t idx, int render)
 {
     int ret = 0;
@@ -1429,7 +1423,6 @@ fail:
     return ret;
 }
 
-
 ssize_t ff_AMediaCodec_dequeueInputBuffer(FFAMediaCodec* codec, int64_t timeoutUs)
 {
     int ret = 0;
diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index 41b009a..d385651 100644
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -389,7 +389,6 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
     int64_t input_dequeue_timeout_us = INPUT_DEQUEUE_TIMEOUT_US;
     int64_t output_dequeue_timeout_us = OUTPUT_DEQUEUE_TIMEOUT_US;
 
-
     if (pkt->size == 0) {
         need_flushing = 1;
     }



More information about the ffmpeg-cvslog mailing list