[FFmpeg-devel] Merge remote-tracking branch 'qatar/master'

[Nicolas George]

L'octidi 28 floréal, an CCXX, Michael Niedermayer a écrit :
> Merge remote-tracking branch 'qatar/master'

> Conflicts:
> 	libavfilter/avfilter.h

During the conflict resolution, you introduced that change:

(diff from previous HEAD)
 typedef struct AVFilterFormats {
-    unsigned format_count;      ///< number of formats
     int64_t *formats;           ///< list of media formats
+    unsigned format_count;      ///< number of formats

(diff from qatar)
 typedef struct AVFilterFormats {
+    int64_t *formats;           ///< list of media formats
     unsigned format_count;      ///< number of formats
-    int *formats;               ///< list of media formats

Did you have a particular reason for swapping the two fields? It seems to
break ABI both with them and with previous ffmpeg.

Regards,

-- 
  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120518/8e9e1117/attachment.asc>