lavc/mjpegenc: check av_frame_alloc() failure.

[android-x86/external-ffmpeg.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 677451c..a9a55df 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -58,6 +58,7 @@ website                                 Robert Swain, Lou Logan
 mailinglists                            Michael Niedermayer, Baptiste Coudurier, Lou Logan
 Google+                                 Paul B Mahol, Michael Niedermayer, Alexander Strasser
 Twitter                                 Lou Logan
+Launchpad                               Timothy Gu
 
 
 libavutil
@@ -333,6 +334,7 @@ Filters:
   vf_extractplanes.c                    Paul B Mahol
   vf_histogram.c                        Paul B Mahol
   vf_il.c                               Paul B Mahol
+  vf_mergeplanes.c                      Paul B Mahol
   vf_psnr.c                             Paul B Mahol
   vf_scale.c                            Michael Niedermayer
   vf_separatefields.c                   Paul B Mahol
@@ -499,8 +501,8 @@ x86                                     Michael Niedermayer
 Releases
 ========
 
+2.1                                     Michael Niedermayer
 2.0                                     Michael Niedermayer
-1.2                                     Michael Niedermayer
 
 If you want to maintain an older release, please contact us